diff -Nru eduke32_20110508-1878_orig/Makefile eduke32_20110508-1878/Makefile
--- eduke32_20110508-1878_orig/Makefile	Wed May 11 15:03:02 2011
+++ eduke32_20110508-1878/Makefile	Wed May 11 15:05:15 2011
@@ -56,7 +56,11 @@
     EOBJ=eobj_win
     LIBS+= $(L_SSP) -Wl,--enable-auto-import
 else
-    LIBS+= -ldl -pthread
+    ifeq ($(PLATFORM),LINUX)
+        LIBS+= -ldl -pthread
+    else
+        LIBS+= -pthread
+    endif
     ifneq (0,$(PROFILER))
         LIBS+= -lprofiler
         debug+= -pg
diff -Nru eduke32_20110508-1878_orig/build/Makefile.shared eduke32_20110508-1878/build/Makefile.shared
--- eduke32_20110508-1878_orig/build/Makefile.shared	Wed May 11 15:03:01 2011
+++ eduke32_20110508-1878/build/Makefile.shared	Wed May 11 17:50:01 2011
@@ -110,6 +110,11 @@
 ifeq ($(PLATFORM),BSD)
     RENDERTYPE=SDL
     BUILDCFLAGS+= -DHAVE_INTTYPES
+    ifneq ($(findstring i386, $(shell uname -m)), i386)
+        override NOASM=1
+    endif
+    override NEDMALLOC=0
+    STDCPPLIB=-lstdc++
 endif
 ifeq ($(PLATFORM),BEOS)
     RENDERTYPE=SDL
diff -Nru eduke32_20110508-1878_orig/build/src/sdlayer.c eduke32_20110508-1878/build/src/sdlayer.c
--- eduke32_20110508-1878_orig/build/src/sdlayer.c	Wed May 11 15:03:01 2011
+++ eduke32_20110508-1878/build/src/sdlayer.c	Wed May 11 15:14:37 2011
@@ -230,7 +230,8 @@
 
 static void attach_debugger_here(void) {}
 
-#ifdef __GNUC__
+/* XXX: libexecinfo could be used on systems without gnu libc. */
+#if defined __GNUC__ && !defined __OpenBSD__
 # define PRINTSTACKONSEGV 1
 # include <execinfo.h>
 #endif
diff -Nru eduke32_20110508-1878_orig/source/enet/src/unix.c eduke32_20110508-1878/source/enet/src/unix.c
--- eduke32_20110508-1878_orig/source/enet/src/unix.c	Wed May 11 15:03:01 2011
+++ eduke32_20110508-1878/source/enet/src/unix.c	Wed May 11 17:48:12 2011
@@ -30,10 +30,6 @@
 #include <sys/poll.h>
 #endif
 
-#ifndef __socklen_t_defined
-typedef int socklen_t;
-#endif
-
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif
diff -Nru eduke32_20110508-1878_orig/source/jaudiolib/Makefile eduke32_20110508-1878/source/jaudiolib/Makefile
--- eduke32_20110508-1878_orig/source/jaudiolib/Makefile	Wed May 11 15:03:02 2011
+++ eduke32_20110508-1878/source/jaudiolib/Makefile	Wed May 11 15:17:45 2011
@@ -16,7 +16,7 @@
 CFLAGS=$(BASECFLAGS) $(F_NO_STACK_PROTECTOR)
 # for BUILD_ECHOFLAGS:
 OURCFLAGS=$(CFLAGS)
-CPPFLAGS=-I$(INC) -I$(SRC) -DHAVE_VORBIS
+CPPFLAGS=-I$(INC) -I$(SRC) `pkg-config --cflags vorbis` -DHAVE_VORBIS
 
 ifeq ($(PLATFORM),DARWIN)
     ifeq (1,$(SDL_FRAMEWORK))