diff --git a/Makefile.am b/Makefile.am
index c174e98d1c..d0a70b06cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,10 +9,11 @@ endif
 SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
 
 AUTOMAKE_OPTIONS = foreign dist-zip
-EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
+EXTRA_DIST  = autogen.sh config/config.awk
+EXTRA_DIST += zfs.spec.in zfs-modules.spec.in
 EXTRA_DIST += META DISCLAIMER GIT
 EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
-noinst_HEADERS = zfs_config.h zfs_unconfig.h
+noinst_HEADERS = zfs_config.h
 
 distclean-local::
 	-$(RM) -R autom4te*.cache
diff --git a/config/Rules.am b/config/Rules.am
index e36860ee68..115fa348f4 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -1,4 +1,4 @@
-DEFAULT_INCLUDES = -I${top_srcdir}
+DEFAULT_INCLUDES = -include ${top_srcdir}/zfs_config.h
 
 # FIXME: Add -Wshadow once everything is working
 AM_CFLAGS  = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror
diff --git a/config/config.awk b/config/config.awk
new file mode 100644
index 0000000000..cc4b7cc265
--- /dev/null
+++ b/config/config.awk
@@ -0,0 +1,15 @@
+# Remove default preprocessor define's from config.h
+#   PACKAGE
+#   PACKAGE_BUGREPORT
+#   PACKAGE_NAME
+#   PACKAGE_STRING
+#   PACKAGE_TARNAME
+#   PACKAGE_VERSION
+#   STDC_HEADERS
+#   VERSION
+
+BEGIN { RS = "" ; FS = "\n" }     \
+	!/.#define PACKAGE./ &&   \
+	!/.#define VERSION./ &&   \
+	!/.#define STDC_HEADERS./ \
+	{ print $0"\n" }
diff --git a/config/kernel.m4 b/config/kernel.m4
index 95c5942540..952eb3f3e3 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -23,15 +23,13 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_RQ_IS_SYNC
 	ZFS_AC_KERNEL_RQ_FOR_EACH_SEGMENT
 
-	dnl # Kernel build make options
-	dnl # KERNELMAKE_PARAMS="V=1"	# Enable verbose module build
-	KERNELMAKE_PARAMS=
-
 	dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
 	dnl # compiler options are added by the kernel build system.
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL"
 	KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
-	KERNELCPPFLAGS="$KERNELCPPFLAGS -I$TOPDIR -I$SPL -I$SPL/include"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -I$SPL/include"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -include $SPL/spl_config.h"
+	KERNELCPPFLAGS="$KERNELCPPFLAGS -include $TOPDIR/zfs_config.h"
 
 	if test "$LINUX_OBJ" != "$LINUX"; then
 		KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
diff --git a/configure.ac b/configure.ac
index f49b09b764..1ef7003f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,10 +35,12 @@ AC_LANG(C)
 ZFS_AC_META
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
-AC_CONFIG_HEADERS([zfs_config.h])
-AH_BOTTOM([#include <zfs_unconfig.h>])
 AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION])
+AC_CONFIG_HEADERS([zfs_config.h], [
+	(mv zfs_config.h zfs_config.h.tmp &&
+	awk -f config/config.awk zfs_config.h.tmp >zfs_config.h &&
+	rm zfs_config.h.tmp) || exit 1])
 
 AC_PROG_INSTALL
 AC_PROG_CC
diff --git a/module/avl/avl.c b/module/avl/avl.c
index eb8bfcd052..cdcf2afa61 100644
--- a/module/avl/avl.c
+++ b/module/avl/avl.c
@@ -1033,7 +1033,6 @@ done:
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-#include "zfs_config.h"
 
 static int avl_init(void) { return 0; }
 static int avl_fini(void) { return 0; }
diff --git a/module/nvpair/nvpair.c b/module/nvpair/nvpair.c
index 02abfdbefb..3492f23518 100644
--- a/module/nvpair/nvpair.c
+++ b/module/nvpair/nvpair.c
@@ -3246,7 +3246,6 @@ nvs_xdr(nvstream_t *nvs, nvlist_t *nvl, char *buf, size_t *buflen)
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-#include "zfs_config.h"
 
 static int nvpair_init(void) { return 0; }
 static int nvpair_fini(void) { return 0; }
diff --git a/module/unicode/u8_textprep.c b/module/unicode/u8_textprep.c
index 9f90e5056d..df6dcf552b 100644
--- a/module/unicode/u8_textprep.c
+++ b/module/unicode/u8_textprep.c
@@ -2133,7 +2133,6 @@ u8_textprep_str(char *inarray, size_t *inlen, char *outarray, size_t *outlen,
 }
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-#include "zfs_config.h"
 
 static int unicode_init(void) { return 0; }
 static int unicode_fini(void) { return 0; }
diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c
index ec93ae4c99..bb73e7ee35 100644
--- a/module/zcommon/zfs_prop.c
+++ b/module/zcommon/zfs_prop.c
@@ -534,7 +534,6 @@ zfs_prop_align_right(zfs_prop_t prop)
 #endif
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
-#include "zfs_config.h"
 
 static int zcommon_init(void) { return 0; }
 static int zcommon_fini(void) { return 0; }
diff --git a/zfs_unconfig.h b/zfs_unconfig.h
deleted file mode 100644
index eee3b87adc..0000000000
--- a/zfs_unconfig.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Undefine these symbols to allow other autoheader enabled packages
- * to leverage the ZFS configure checks without a header conflict.
- */
-#undef PACKAGE
-#undef PACKAGE_BUGREPORT
-#undef PACKAGE_NAME
-#undef PACKAGE_STRING
-#undef PACKAGE_TARNAME
-#undef PACKAGE_VERSION
-#undef VERSION
-#undef STDC_HEADERS