diff --git a/code/qcommon/q_platform.h b/code/qcommon/q_platform.h
index 8859b7ac..16817c88 100644
--- a/code/qcommon/q_platform.h
+++ b/code/qcommon/q_platform.h
@@ -192,6 +192,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #endif
 
+//================================================================ NetBSD ===
+
+// This is very much like the FreeBSD one and can probably be merged
+#ifdef __NetBSD__
+
+#include <machine/endian.h>
+
+#define OS_STRING "netbsd"
+#define ID_INLINE inline
+#define PATH_SEP '/'
+
+#ifdef __i386__
+#define ARCH_STRING "i386"
+// Netbsd has alot of platforms
+#endif
+
+#if BYTE_ORDER == BIG_ENDIAN
+#define Q3_BIG_ENDIAN
+#else
+#define Q3_LITTLE_ENDIAN
+#endif
+
+#define DLL_EXT ".so"
+
+#endif
+
 //================================================================= SUNOS ===
 
 #ifdef __sun
diff --git a/code/unix/Makefile b/code/unix/Makefile
index 2247bcdc..e47a948a 100644
--- a/code/unix/Makefile
+++ b/code/unix/Makefile
@@ -472,6 +472,47 @@ ifeq ($(PLATFORM),freebsd)
 
 else # ifeq freebsd
 
+#############################################################################
+# SETUP AND BUILD -- NETBSD
+#############################################################################
+
+ifeq ($(PLATFORM),netbsd)
+
+  ifeq ($(shell uname -m),i386)
+    ARCH=i386
+  endif
+
+  CC=gcc
+  LDFLAGS=-lm
+  SHLIBEXT=so
+  SHLIBCFLAGS=-fPIC
+  SHLIBLDFLAGS=-shared $(LDFLAGS)
+  THREAD_LDFLAGS=-lpthread
+
+  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes
+  DEBUG_CFLAGS=$(BASE_CFLAGS) -g
+
+  ifneq ($(ARCH),i386)
+    BASE_CFLAGS += -DNO_VM_COMPILED
+  endif
+
+  ifeq ($(ARCH),i386)
+    TARGETS=\
+      $(B)/baseq3/cgame$(ARCH).$(SHLIBEXT) \
+      $(B)/baseq3/qagame$(ARCH).$(SHLIBEXT) \
+      $(B)/baseq3/ui$(ARCH).$(SHLIBEXT) \
+      $(B)/missionpack/cgame$(ARCH).$(SHLIBEXT) \
+      $(B)/missionpack/qagame$(ARCH).$(SHLIBEXT) \
+      $(B)/missionpack/ui$(ARCH).$(SHLIBEXT) \
+      $(B)/$(PLATFORM)q3ded
+  else
+    TARGETS=\
+      $(B)/$(PLATFORM)q3ded
+
+  endif
+
+else # ifeq netbsd
+
 #############################################################################
 # SETUP AND BUILD -- IRIX
 #############################################################################
@@ -630,6 +671,7 @@ endif #Linux
 endif #darwin
 endif #mingw32
 endif #FreeBSD
+endif #NetBSD
 endif #IRIX
 endif #SunOS