diff -Naur xl2tpd-1.3.8-orig/network.c xl2tpd-1.3.8/network.c
--- xl2tpd-1.3.8-orig/network.c	2016-08-24 11:56:13.438007170 -0400
+++ xl2tpd-1.3.8/network.c	2016-08-24 12:22:36.945960487 -0400
@@ -781,6 +781,9 @@
             sax.pppol2tp.addr.sin_family = AF_INET;
             sax.pppol2tp.s_tunnel  = t->ourtid;
             sax.pppol2tp.d_tunnel  = t->tid;
+            sax.pppol2tp.s_session = 0;
+            sax.pppol2tp.d_session = 0;
+
             if ((connect(fd2, (struct sockaddr *)&sax, sizeof(sax))) < 0) {
                 l2tp_log (LOG_WARNING, "%s: Unable to connect PPPoL2TP socket. %d %s\n",
                      __FUNCTION__, errno, strerror(errno));
diff -Naur xl2tpd-1.3.8-orig/xl2tpd.c xl2tpd-1.3.8/xl2tpd.c
--- xl2tpd-1.3.8-orig/xl2tpd.c	2016-08-24 11:56:13.436007180 -0400
+++ xl2tpd-1.3.8/xl2tpd.c	2016-08-24 12:07:47.057504872 -0400
@@ -274,9 +274,6 @@
                      * OK...pppd died, we can go ahead and close the pty for
                      * it
                      */
-#ifdef USE_KERNEL
-                 if (!kernel_support)
-#endif
                     close (c->fd);
                     c->fd = -1;
                     /*