diff -Nur l2tpd-0.69/Makefile l2tpd-0.69-netbsd/Makefile
--- l2tpd-0.69/Makefile	Sat Aug 10 09:42:22 2002
+++ l2tpd-0.69-netbsd/Makefile	Mon Dec 27 11:54:20 2004
@@ -31,11 +31,15 @@
 #
 # Uncomment the next line for Linux
 #
-OSFLAGS= -DLINUX -I/usr/include
+#OSFLAGS= -DLINUX -I/usr/include
 #
 # Uncomment the following to use the kernel interface under Linux
 #
 #OSFLAGS+= -DUSE_KERNEL
+#
+# Uncomment the next line for NetBSD
+#
+OSFLAGS= -DNETBSD
 #
 # Uncomment the next line for FreeBSD
 #
diff -Nur l2tpd-0.69/control.c l2tpd-0.69-netbsd/control.c
--- l2tpd-0.69/control.c	Thu Apr 11 05:09:33 2002
+++ l2tpd-0.69-netbsd/control.c	Mon Dec 27 11:40:08 2004
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
diff -Nur l2tpd-0.69/l2tp.h l2tpd-0.69-netbsd/l2tp.h
--- l2tpd-0.69/l2tp.h	Tue Aug 20 02:26:23 2002
+++ l2tpd-0.69-netbsd/l2tp.h	Mon Dec 27 11:38:53 2004
@@ -21,6 +21,7 @@
 
 #define MAXSTRLEN 120           /* Maximum length of common strings */
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <termios.h>
 #include "osport.h"
diff -Nur l2tpd-0.69/l2tpd.c l2tpd-0.69-netbsd/l2tpd.c
--- l2tpd-0.69/l2tpd.c	Mon Aug 19 23:12:17 2002
+++ l2tpd-0.69-netbsd/l2tpd.c	Mon Dec 27 10:29:20 2004
@@ -21,7 +21,9 @@
 #include <errno.h>
 #include <unistd.h>
 #if (__GLIBC__ < 2)
-# if defined(FREEBSD)
+# if defined (NETBSD)
+#  include <signal.h>
+# elif defined(FREEBSD)
 #  include <sys/signal.h>
 # elif defined(LINUX)
 #  include <bsd/signal.h>
@@ -36,6 +38,9 @@
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifdef NETBSD
+#include <sys/socket.h>
+#endif
 #ifdef USE_KERNEL
 #include <sys/ioctl.h>
 #endif
diff -Nur l2tpd-0.69/md5.c l2tpd-0.69-netbsd/md5.c
--- l2tpd-0.69/md5.c	Sat Mar 16 05:07:05 2002
+++ l2tpd-0.69-netbsd/md5.c	Mon Dec 27 10:29:20 2004
@@ -1,4 +1,6 @@
-#ifdef FREEBSD
+#ifdef NETBSD
+# include <sys/endian.h>
+#elif FREEBSD
 # include <machine/endian.h>
 #elif defined(LINUX)
 # include <endian.h>
diff -Nur l2tpd-0.69/network.c l2tpd-0.69-netbsd/network.c
--- l2tpd-0.69/network.c	Thu Apr 11 05:09:33 2002
+++ l2tpd-0.69-netbsd/network.c	Mon Dec 27 11:50:11 2004
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
diff -Nur l2tpd-0.69/pty.c l2tpd-0.69-netbsd/pty.c
--- l2tpd-0.69/pty.c	Thu Apr 11 05:09:33 2002
+++ l2tpd-0.69-netbsd/pty.c	Mon Dec 27 10:29:20 2004
@@ -29,7 +29,7 @@
 #define PTY01 "0123456789abcdef"
 #endif
 
-#ifdef FREEBSD
+#if defined (FREEBSD) || (NETBSD)
 #define PTY00 "/dev/ptyXX"
 #define PTY10 "p"
 #define PTY01 "0123456789abcdefghijklmnopqrstuv"