diff --git a/configure b/configure
index 1caa547..6e04b61 100755
--- a/configure
+++ b/configure
@@ -117,7 +117,7 @@ linux_check_objdir()
 	then
 		echo -n "kernel build source in ${LINUX_CHECK_OBJ}... "
 
-		if [ -f "${LINUX_CHECK_OBJ}/include/linux/version.h" -a -f "${LINUX_CHECK_OBJ}/include/linux/autoconf.h" ]
+		if [ -f "${LINUX_CHECK_OBJ}/include/linux/version.h" -a \( -f "${LINUX_CHECK_OBJ}/include/linux/autoconf.h" -o -f "${LINUX_CHECK_OBJ}/include/generated/autoconf.h" \) ]
 		then
 			LINUX_OBJ="$LINUX_CHECK_OBJ"
 			echo "yes"
@@ -834,6 +834,16 @@ do_linux26()
 		echo "EXTRA_CFLAGS += -DUSE_CONFIG_H" >> Makefile
 	fi
 
+	if [ ${LINUX_USE_GENERATED_AUTOCONF_H} -eq 1 ]
+	then
+		echo "EXTRA_CFLAGS += -DUSE_GENERATED_AUTOCONF_H" >> Makefile
+	fi
+
+	if [ ${LINUX_USE_GENERATED_UTSRELEASE_H} -eq 1 ]
+	then
+		echo "EXTRA_CFLAGS += -DUSE_GENERATED_UTSRELEASE_H" >> Makefile
+	fi
+
 	if [ ${DEBUG} -eq 1 ]
 	then
 		echo "EXTRA_CFLAGS += -DDEBUG" >> Makefile
@@ -1558,6 +1568,8 @@ WITH_EXAMPLE_PERL=0
 WITH_EXAMPLE_PYTHON=0
 LINUX_USE_PARENT=0
 LINUX_USE_CONFIG_H=1
+LINUX_USE_GENERATED_AUTOCONF_H=1
+LINUX_USE_GENERATED_UTSRELEASE_H=1
 LINUX26_USE_SUSPEND=0
 LINUX26_USE_FREEZER=0
 LINUX26_USE_SYSCALLS_H=0
@@ -2018,6 +2030,18 @@ case ${OS} in
 			else
 				LINUX_USE_CONFIG_H=0
 			fi
+			if [ -f "$TEMPNAME/generated/autoconf.h" ]
+			then
+				echo "CFLAGS += -DUSE_GENERATED_AUTOCONF_H" >> Makefile
+			else
+				LINUX_USE_GENERATED_AUTOCONF_H=0
+			fi
+			if [ -f "$TEMPNAME/generated/utsrelease.h" ]
+			then
+				echo "CFLAGS += -DUSE_GENERATED_UTSRELEASE_H" >> Makefile
+			else
+				LINUX_USE_GENERATED_UTSRELEASE_H=0
+			fi
 			if [ -f "$TEMPNAME/linux/utsrelease.h" ]
 			then
 				echo "CFLAGS += -DUSE_UTSRELEASE_H" >> Makefile
diff --git a/linux_conf.c b/linux_conf.c
index 70e9981..efd8b93 100644
--- a/linux_conf.c
+++ b/linux_conf.c
@@ -1,10 +1,14 @@
 #ifdef USE_CONFIG_H
+#elif USE_GENERATED_AUTOCONF_H
+#include <generated/autoconf.h>
 #else
 #include <linux/autoconf.h>
 #endif
 #include <linux/version.h>
 #ifdef USE_UTSRELEASE_H
 #include <linux/utsrelease.h>
+#elif USE_GENERATED_UTSRELEASE_H
+#include <generated/utsrelease.h>
 #endif
 #include <stdio.h>