diff --git a/config/kernel-kstrtoul.m4 b/config/kernel-kstrtoul.m4
new file mode 100644
index 000000000000..5530e0e2d854
--- /dev/null
+++ b/config/kernel-kstrtoul.m4
@@ -0,0 +1,21 @@
+dnl #
+dnl # 2.6.39 API change
+dnl #
+dnl # 33ee3b2e2eb9 kstrto*: converting strings to integers done (hopefully) right
+dnl #
+dnl # If kstrtoul() doesn't exist, fallback to use strict_strtoul() which has
+dnl # existed since 2.6.25.
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_KSTRTOUL], [
+	AC_MSG_CHECKING([whether kstrtoul() exists])
+	ZFS_LINUX_TRY_COMPILE([
+		#include <linux/kernel.h>
+	],[
+		int ret __attribute__ ((unused)) = kstrtoul(NULL, 10, NULL);
+	],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_KSTRTOUL, 1, [kstrtoul() exists])
+	],[
+		AC_MSG_RESULT(no)
+	])
+])
diff --git a/config/kernel.m4 b/config/kernel.m4
index 884f3401ca76..2797a86abf21 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -168,6 +168,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 	ZFS_AC_KERNEL_TOTALHIGH_PAGES
 	ZFS_AC_KERNEL_BLK_QUEUE_DISCARD
 	ZFS_AC_KERNEL_BLK_QUEUE_SECURE_ERASE
+	ZFS_AC_KERNEL_KSTRTOUL
 
 	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
 		KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"