diff --git a/ChangeLog.txt b/ChangeLog.txt
index aa07d78c3a..42c104302b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -30,6 +30,9 @@ Library:
 - Fix connection problems when mosquitto_loop_start() was called before
   mosquitto_connect_async(). Closes #848.
 
+Build:
+- Fixes for building on NetBSD. Closes #258.
+
 
 1.5 - 20180502
 ==============
diff --git a/config.h b/config.h
index 906fad4815..7b5a7ae688 100644
--- a/config.h
+++ b/config.h
@@ -34,4 +34,8 @@
 #  define _POSIX_C_SOURCE 200809L
 #endif
 
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__SYMBIAN32__) || defined(__QNX__)
+#  define HAVE_NETINET_IN_H
+#endif
+
 #endif
diff --git a/config.mk b/config.mk
index 41c7af6a19..3880bb772e 100644
--- a/config.mk
+++ b/config.mk
@@ -130,7 +130,7 @@ LIB_LDFLAGS:=${LDFLAGS}
 BROKER_CFLAGS:=${LIB_CFLAGS} ${CPPFLAGS} -DVERSION="\"${VERSION}\"" -DWITH_BROKER
 CLIENT_CFLAGS:=${CFLAGS} ${CPPFLAGS} -I../lib -DVERSION="\"${VERSION}\""
 
-ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD)),)
+ifneq ($(or $(findstring $(UNAME),FreeBSD), $(findstring $(UNAME),OpenBSD), $(findstring $(UNAME),NetBSD)),)
 	BROKER_LIBS:=-lm
 else
 	BROKER_LIBS:=-ldl -lm
@@ -277,7 +277,7 @@ localedir=${prefix}/share/locale
 STRIP?=strip
 
 ifeq ($(WITH_STRIP),yes)
-	STRIP_OPTS:=-s --strip-program=${CROSS_COMPILE}${STRIP}
+	STRIP_OPTS?=-s --strip-program=${CROSS_COMPILE}${STRIP}
 endif
 
 ifeq ($(WITH_EPOLL),yes)
diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h
index 4e399f0a7e..0b9a0e27cf 100644
--- a/lib/memory_mosq.h
+++ b/lib/memory_mosq.h
@@ -20,7 +20,7 @@ and the Eclipse Distribution License is available at
 #include <stdio.h>
 #include <sys/types.h>
 
-#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && !defined(WIN32) && !defined(__SYMBIAN32__) && !defined(__ANDROID__) && !defined(__UCLIBC__) && !defined(__OpenBSD__)
+#if defined(WITH_MEMORY_TRACKING) && defined(WITH_BROKER) && defined(__GLIBC__)
 #define REAL_WITH_MEMORY_TRACKING
 #endif
 
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
index 0b5792a295..24140c3f1f 100644
--- a/lib/net_mosq.c
+++ b/lib/net_mosq.c
@@ -37,17 +37,12 @@ and the Eclipse Distribution License is available at
 #include <sys/endian.h>
 #endif
 
-#ifdef __FreeBSD__
+#ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
 
-#ifdef __SYMBIAN32__
-#include <netinet/in.h>
-#endif
-
 #ifdef __QNX__
 #include <net/netbyte.h>
-#include <netinet/in.h>
 #endif
 
 #ifdef WITH_TLS
diff --git a/src/net.c b/src/net.c
index 1d1e6c15f8..64f8bdc538 100644
--- a/src/net.c
+++ b/src/net.c
@@ -36,15 +36,12 @@ and the Eclipse Distribution License is available at
 #include <tcpd.h>
 #endif
 
-#ifdef __FreeBSD__
+#ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
-#  include <sys/socket.h>
 #endif
 
 #ifdef __QNX__
-#include <netinet/in.h>
 #include <net/netbyte.h>
-#include <sys/socket.h>
 #endif
 
 #include "mosquitto_broker_internal.h"