diff --git a/Makefile.common.in b/Makefile.common.in
index 926b761..0362fd5 100644
--- a/Makefile.common.in
+++ b/Makefile.common.in
@@ -71,7 +71,6 @@ OPT_DISABLE_PACKIHX     = @OPT_DISABLE_PACKIHX@
 OPT_DISABLE_SDBINUTILS  = @OPT_DISABLE_SDBINUTILS@
 OPT_DISABLE_SDCPP       = @OPT_DISABLE_SDCPP@
 OPT_DISABLE_UCSIM       = @OPT_DISABLE_UCSIM@
-OPT_DISABLE_NON_FREE    = @OPT_DISABLE_NON_FREE@
 
 SLIB                    = $(top_builddir)/support/util
 
diff --git a/Makefile.in b/Makefile.in
index 5485074..3071472 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,9 +100,6 @@ endif
 ifeq ($(OPT_DISABLE_DEVICE_LIB), 0)
 TARGETS        += sdcc-device-lib
 PKGS           += device/lib
-ifeq ($(OPT_DISABLE_NON_FREE), 0)
-PKGS           += device/non-free/lib
-endif
 endif
 
 ifeq ($(OPT_DISABLE_PACKIHX), 0)
@@ -123,9 +120,6 @@ endif
 TARGETS        += sdcc-libs sdcc-cc sdcc-device-inc sdcc-as sdcc-ld sdcc-scripts
 
 PKGS           += $(SDCC_LIBS) src device/include
-ifeq ($(OPT_DISABLE_NON_FREE), 0)
-PKGS           += device/non-free/include
-endif
 PKGS           += $(SDCC_AS) sdas/linksrc $(SDCC_SCRIPTS)
 
 PORTS           = $(shell cat ports.build)
@@ -171,21 +165,12 @@ sdcc-sdbinutils:
 
 sdcc-device-inc:
 	$(MAKE) -C device/include
-ifeq ($(OPT_DISABLE_NON_FREE), 0)
-	$(MAKE) -C device/non-free/include
-endif
 
 sdcc-device-lib: sdcc-cc sdcc-as sdcc-ld $(SDCC_BINUTILS)
 	$(MAKE) -C device/lib
-ifeq ($(OPT_DISABLE_NON_FREE), 0)
-	$(MAKE) -C device/non-free/lib
-endif
 
 sdcc-device-tini:
 	$(MAKE) -C device/include
-ifeq ($(OPT_DISABLE_NON_FREE), 0)
-	$(MAKE) -C device/non-free/include
-endif
 	$(MAKE) -C device/lib model-ds390 model-ds400
 
 # doc depends on latex and latex2html
diff --git a/configure b/configure
index e1805c8..6ad4efd 100755
--- a/configure
+++ b/configure
@@ -7079,17 +7079,11 @@ if test "${include_dir_suffix}" = ""; then
 fi
 
 
-if test "${non_free_inclib_dir_suffix}" = ""; then
-    non_free_inclib_dir_suffix="sdcc/non-free"
-fi
 
 # non_free_include_dir_suffix:
 # *nix default: "sdcc/non-free/include"
 
 
-if test "${non_free_include_dir_suffix}" = ""; then
-    non_free_include_dir_suffix="${non_free_inclib_dir_suffix}/include"
-fi
 
 # lib_dir_suffix:
 # *nix default: "sdcc/lib"
@@ -7101,9 +7095,6 @@ fi
 # non_free_lib_dir_suffix:
 # *nix default: "sdcc/non-free/lib"
 
-if test "${non_free_lib_dir_suffix}" = ""; then
-    non_free_lib_dir_suffix="${non_free_inclib_dir_suffix}/lib"
-fi
 
 # docdir:
 # *nix default: "${datadir}/sdcc/doc"
@@ -8435,19 +8426,9 @@ _ACEOF
 
 
 
-  # Check whether --enable-non-free was given.
-if test "${enable_non_free+set}" = set; then :
-  enableval=$enable_non_free;
-fi
 
 
-      arg1=`echo non-free | sed s/-/_/`
-
-  if test "`eval echo \\$enable_$arg1`" = "no"; then
     OPT_DISABLE_NON_FREE=1
-  else
-    OPT_DISABLE_NON_FREE=0
-  fi
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8851,20 +8832,12 @@ if test $OPT_DISABLE_PIC14 = 0; then
 
   test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14"
 
-fi
-if test $OPT_DISABLE_PIC14 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
-  test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic14"
-
 fi
 if test $OPT_DISABLE_PIC16 = 0; then
   ac_config_files="$ac_config_files src/pic16/Makefile"
 
   test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic16"
 
-fi
-if test $OPT_DISABLE_PIC16 = 0 && test $OPT_DISABLE_NON_FREE = 0; then
-  test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/non-free/lib/pic16"
-
 fi
 
 if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0; then
@@ -8941,15 +8914,10 @@ fi
 
 test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile"
 
-test $OPT_DISABLE_DEVICE_LIB = 0 && test $OPT_DISABLE_NON_FREE = 0 && ac_config_files="$ac_config_files device/non-free/lib/Makefile"
 
 
 ac_config_files="$ac_config_files main.mk:main_in.mk src/Makefile device/include/Makefile sdas/linksrc/Makefile support/makebin/Makefile support/regression/Makefile support/valdiag/Makefile support/scripts/Makefile support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in"
 
-if test $OPT_DISABLE_NON_FREE = 0; then
-  ac_config_files="$ac_config_files device/non-free/include/Makefile"
-
-fi
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure