diff --git a/configure.in b/configure.in
index f7cc62cee..3c2fd4d1c 100644
--- a/configure.in
+++ b/configure.in
@@ -425,6 +425,17 @@ AC_ARG_ENABLE(
 	fi]
 )
 
+AC_ARG_ENABLE(
+	[kernel-netlink],
+	AS_HELP_STRING([--disable-kernel-netlink],[disable the netlink kernel interface. (default is NO).]),
+	[if test x$enableval = xyes; then
+		kernel_netlink=true
+	 else
+		kernel_netlink=false
+	fi],
+	kernel_netlink=true
+)
+
 AC_ARG_ENABLE(
 	[nat-transport],
 	AS_HELP_STRING([--enable-nat-transport],[enable NAT traversal with IPsec transport mode (default is NO).]),
@@ -853,6 +864,7 @@ AM_CONDITIONAL(USE_EAP_IDENTITY, test x$eap_identity = xtrue)
 AM_CONDITIONAL(USE_EAP_MD5, test x$eap_md5 = xtrue)
 AM_CONDITIONAL(USE_EAP_GTC, test x$eap_gtc = xtrue)
 AM_CONDITIONAL(USE_EAP_AKA, test x$eap_aka = xtrue)
+AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
 
 dnl other options
 dnl =============
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index da1f3db6d..eec14cc95 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -142,10 +142,10 @@ endif
 SUBDIRS = . 
 PLUGINS = ${libstrongswan_plugins}
 
-#if USE_KERNEL_NETLINK
+if USE_KERNEL_NETLINK
   SUBDIRS += plugins/kernel_netlink
   PLUGINS += kernel-netlink
-#endif
+endif
 
 if USE_STROKE
   SUBDIRS += plugins/stroke