configure.ac   | 17 ++---------------
 shared/utils.c |  5 ++++-
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3eccc3a..d0111cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,27 +52,14 @@ dnl
 dnl Required headers
 dnl
 AC_HEADER_STDC
-AC_CHECK_HEADERS([
-	fcntl.h
-	paths.h
-	stdarg.h
-	stdbool.h
-	sys/ioctl.h
-	sys/time.h
-	syslog.h
-	unistd.h
-	])
+AC_CHECK_HEADERS([fcntl.h paths.h stdarg.h stdbool.h sys/ioctl.h sys/time.h syslog.h unistd.h])
 
 AC_CHECK_HEADERS(pppd/pppd.h,,
   AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.))
 
 dnl
 dnl Check the presense of other pppd/*.h files
-AC_CHECK_HEADERS([
-    pppd/chap.h
-    pppd/chap-new.h
-    pppd/chap_ms.h
-    ])
+AC_CHECK_HEADERS([pppd/chap.h pppd/chap-new.h pppd/chap_ms.h])
 
 dnl
 dnl Versions >= 2.5.0 will have pkg-config support
diff --git a/shared/utils.c b/shared/utils.c
index 15342c9..ed0447e 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -64,18 +64,20 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
 {
     char **l2tp_binary;
 
+/* Don't try to use kl2tpd: not present in the Sisyphus
     static const char *kl2tp_binary_paths[] = {"/usr/bin/kl2tpd",
                                                "/sbin/kl2tpd",
                                                "/usr/sbin/kl2tpd",
                                                "/usr/local/sbin/kl2tpd",
                                                NULL};
-
+*/
     static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
                                                "/sbin/xl2tpd",
                                                "/usr/sbin/xl2tpd",
                                                "/usr/local/sbin/xl2tpd",
                                                NULL};
 
+/* Don't try to use kl2tpd: not present in the Sisyphus
     l2tp_binary = (char **) kl2tp_binary_paths;
     while (*l2tp_binary != NULL) {
         if (g_file_test(*l2tp_binary, G_FILE_TEST_EXISTS)) {
@@ -85,6 +87,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
         }
         l2tp_binary++;
     }
+*/
 
     l2tp_binary = (char **) xl2tp_binary_paths;
     while (*l2tp_binary != NULL) {