diff --git a/INSTALL b/INSTALL
index 541cbb9..9c888f0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Supported configurations for this release
 
 	* iptables >= 1.4.5
 
-	* kernel-devel >= 2.6.35
+	* kernel-devel >= 2.6.36
 	  with prepared build/output directory
 	  - CONFIG_NF_CONNTRACK or CONFIG_IP_NF_CONNTRACK
 	  - CONFIG_NF_CONNTRACK_MARK or CONFIG_IP_NF_CONNTRACK_MARK
diff --git a/configure.ac b/configure.ac
index 0414a8d..c865408 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ if test -n "$kbuilddir"; then
 			echo "WARNING: That kernel version is not officially supported.";
 		elif test "$kmajor" -eq 3; then
 			:;
-		elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 35; then
+		elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 36; then
 			:;
 		else
 			echo "WARNING: That kernel version is not officially supported.";
diff --git a/doc/changelog.txt b/doc/changelog.txt
index 1226792..0a245fd 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -2,7 +2,7 @@
 HEAD
 ====
 Changes:
-- remove support for Linux 2.6.17--2.6.34
+- remove support for Linux 2.6.17–2.6.35
 - remove xt_TEE (this is available upstream since 2.6.35)
 
 
diff --git a/extensions/compat_xtables.h b/extensions/compat_xtables.h
index bac7e23..a36b724 100644
--- a/extensions/compat_xtables.h
+++ b/extensions/compat_xtables.h
@@ -8,8 +8,8 @@
 
 #define DEBUGP Use__pr_debug__instead
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
-#	warning Kernels below 2.6.35 not supported.
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
+#	warning Kernels below 2.6.36 not supported.
 #endif
 
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -24,11 +24,7 @@
 #define ipt_unregister_table(tbl) ipt_unregister_table(&init_net, (tbl))
 #define ip6t_unregister_table(tbl) ip6t_unregister_table(&init_net, (tbl))
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
-#	define rt_dst(rt)	(&(rt)->dst)
-#else
-#	define rt_dst(rt)	(&(rt)->u.dst)
-#endif
+#define rt_dst(rt)	(&(rt)->dst)
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
 #	define nf_nat_ipv4_multi_range_compat nf_nat_multi_range_compat
diff --git a/extensions/xt_CHECKSUM.c b/extensions/xt_CHECKSUM.c
index c471824..d2c72fe 100644
--- a/extensions/xt_CHECKSUM.c
+++ b/extensions/xt_CHECKSUM.c
@@ -13,13 +13,6 @@
 #include <linux/skbuff.h>
 #include <linux/version.h>
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
-#	error ----------------------------------------------------------
-#	error This module has been merged into, and is available in the
-#	error mainline since Linux kernel v2.6.36. Please use that.
-#	error ----------------------------------------------------------
-#endif
-
 #include <linux/netfilter/x_tables.h>
 #include "xt_CHECKSUM.h"
 #include "compat_xtables.h"
diff --git a/extensions/xt_LOGMARK.c b/extensions/xt_LOGMARK.c
index 1931c4a..2bca339 100644
--- a/extensions/xt_LOGMARK.c
+++ b/extensions/xt_LOGMARK.c
@@ -80,13 +80,8 @@ logmark_tg(struct sk_buff **pskb, const struct xt_action_param *par)
 	printk(" ctdir=%s", dir_names[ctinfo >= IP_CT_IS_REPLY]);
 	if (ct == NULL)
 		printk(" ct=NULL ctmark=NULL ctstate=INVALID ctstatus=NONE");
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
 	else if (nf_ct_is_untracked(ct))
 		printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE");
-#else
-	else if (ct == &nf_conntrack_untracked)
-		printk(" ct=UNTRACKED ctmark=NULL ctstate=UNTRACKED ctstatus=NONE");
-#endif
 	else
 		logmark_ct(ct, ctinfo);
 
diff --git a/extensions/xt_SYSRQ.c b/extensions/xt_SYSRQ.c
index 3c08178..48eafd8 100644
--- a/extensions/xt_SYSRQ.c
+++ b/extensions/xt_SYSRQ.c
@@ -151,11 +151,7 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len)
 	sysrq_seqno = new_seqno;
 	for (i = 0; i < len && data[i] != ','; ++i) {
 		printk(KERN_INFO KBUILD_MODNAME ": SysRq %c\n", data[i]);
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
 		handle_sysrq(data[i]);
-#else
-		handle_sysrq(data[i], NULL);
-#endif
 	}
 	return NF_ACCEPT;
 
@@ -186,11 +182,7 @@ static unsigned int sysrq_tg(const void *pdata, uint16_t len)
 		return NF_DROP;
 	}
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)
 	handle_sysrq(c);
-#else
-	handle_sysrq(c, NULL);
-#endif
 	return NF_ACCEPT;
 }
 #endif