diff --git a/CHANGELOG b/CHANGELOG
index fb11388..be84d0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@ iodine - IP over DNS is now easy
 CHANGES:
 
 xxxx-xx-xx: 0.3.2
+	- Support for NetBSD
+	- Name parsing routines rewritten, added regression tests
 	- New encoding, 25% more peak upstream throughput
 	- New -l option to set local ip to listen to on server
 
diff --git a/tun.c b/tun.c
index d22f950..d750362 100644
--- a/tun.c
+++ b/tun.c
@@ -142,7 +142,7 @@ close_tun(int tun_fd)
 int 
 write_tun(int tun_fd, char *data, int len) 
 {
-#if defined (FREEBSD) || defined (DARWIN)
+#if defined (FREEBSD) || defined (DARWIN) || defined(NETBSD)
 	data += 4;
 	len -= 4;
 #else /* !FREEBSD/DARWIN */
@@ -169,7 +169,7 @@ write_tun(int tun_fd, char *data, int len)
 int 
 read_tun(int tun_fd, char *buf, int len) 
 {
-#if defined (FREEBSD) || defined (DARWIN)
+#if defined (FREEBSD) || defined (DARWIN) || defined(NETBSD)
 	// FreeBSD has no header
 	return read(tun_fd, buf + 4, len - 4) + 4;
 #else /* !FREEBSD */