diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0.txt
similarity index 100%
rename from LICENSES/GPL-2.0-or-later.txt
rename to LICENSES/GPL-2.0.txt
diff --git a/software/Makefile b/software/Makefile
index ee25bafdf8484b49e8b0d7943d967a368df6afad..8801ad522097c97252a0c79a5ee057ed56278c56 100644
--- a/software/Makefile
+++ b/software/Makefile
@@ -2,51 +2,14 @@
 #
 # Copyright (C) 2019 CERN
 
-TOP_DIR ?= $(shell pwd)/..
-
--include Makefile.specific
-
-# include parent_common.mk for buildsystem's defines
-#use absolute path for REPO_PARENT
-REPO_PARENT ?= $(shell /bin/pwd)/..
--include $(REPO_PARENT)/parent_common.mk
-
-GCORES ?= $(TOP_DIR)
-include $(GCORES)/common.mk
-DIR_NAME := general-cores-$(VERSION)
-DST := $(PREFIX)/usr/src/$(DIR_NAME)/
-
 DIRS := i2c-ocores
 DIRS += spi-ocores
 DIRS += htvic
 
-GIT ?= git
-ifeq (,$(shell which $(GIT)))
-$(error "Missing git")
-endif
+.PHONY: all clean modules install modules_install
 
-.PHONY: all clean modules install modules_install dkms_install
+all: modules
+install: modules_install
 
-all clean modules install modules_install:
+clean modules modules_install coccicheck:
 	for D in $(DIRS); do $(MAKE) -C $$D $@; done
-
-dkms_install:
-	$(eval $@_dst := $(shell mktemp -d))
-	@mkdir -p $($@_dst)
-	@mkdir -p $(DST)
-ifdef RPMBUILD
-# We already did the file selection when producing the tar.gz
-# Just copy
-	@cp -a $(GCORES)/* $(DST)
-else
-	@$(GIT) archive --format=tar -o $($@_dst)/$(DIR_NAME).tar --prefix=$(DIR_NAME)/ HEAD
-	@cd $($@_dst) && tar -xf $(DIR_NAME).tar
-	@mv $($@_dst)/$(DIR_NAME)/* $(DST) && rm -rf $($@_dst)
-	@cp $(GCORES)/common.mk $(DST)
-endif
-	@sed -e '2,$$d' -i $(DST)/common.mk
-	@sed -r -i -e "s/@PKGVER@/$(VERSION)/" $(DST)/dkms.conf
-	@sed -e "15d" -e "6,13d" -e "23,26d" -e '33,$$d' \
-	     -i $(DST)/Makefile
-	@find $(DST) -name Makefile -exec \
-	      sed -r -e "s,^(TOP_DIR.*)[.]{2}/?$$,\1," -i {} \;
diff --git a/software/htvic/drivers/htvic.c b/software/htvic/drivers/htvic.c
index 113c41a02bca18738796bc5e2ebc082b52ef30a2..2f87aa7345d535fe236f01867b472210fcaa9e17 100644
--- a/software/htvic/drivers/htvic.c
+++ b/software/htvic/drivers/htvic.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2016 CERN
  * Author: Federico Vaga <federico.vaga@cern.ch>
diff --git a/software/htvic/drivers/htvic.h b/software/htvic/drivers/htvic.h
index 3a757f66f9ed9547180bebde4022924e6f105840..7e632682939fd8540cc2bc20f18cec45a4cfa28d 100644
--- a/software/htvic/drivers/htvic.h
+++ b/software/htvic/drivers/htvic.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Copyright (c) 2016 CERN
  * Author: Federico Vaga <federico.vaga@cern.ch>
diff --git a/software/spi-ocores/drivers/spi/spi-ocores.c b/software/spi-ocores/drivers/spi/spi-ocores.c
index 2c53043baab8a719b88435a8d751cc176ac0f684..57551687adeb3ea5580dfe50a45d75682264ce34 100644
--- a/software/spi-ocores/drivers/spi/spi-ocores.c
+++ b/software/spi-ocores/drivers/spi/spi-ocores.c
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2019 CERN (www.cern.ch)
  * Author: Federico Vaga <federico.vaga@cern.ch>
diff --git a/software/spi-ocores/include/linux/platform_data/spi-ocores.h b/software/spi-ocores/include/linux/platform_data/spi-ocores.h
index 042c4ceb5dfa60a248d9984c65c1678e2da7050f..2febfd700e7a79fe9d0efb8e89a8c00d80a313ab 100644
--- a/software/spi-ocores/include/linux/platform_data/spi-ocores.h
+++ b/software/spi-ocores/include/linux/platform_data/spi-ocores.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2019 CERN (www.cern.ch)
  * Author: Federico Vaga <federico.vaga@cern.ch>