diff --git a/Makefile b/Makefile
index ad7303dd..c6e365b7 100644
--- a/Makefile
+++ b/Makefile
@@ -648,11 +648,10 @@ else # ifeq freebsd
 
 ifeq ($(PLATFORM),openbsd)
 
-  #default to i386, no tests done on anything else
-  ARCH=i386
+  ARCH=$(shell uname -m)
 
   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-    -DUSE_ICON
+    -DUSE_ICON -DMAP_ANONYMOUS=MAP_ANON
   CLIENT_CFLAGS = $(SDL_CFLAGS)
   SERVER_CFLAGS = 
 
diff --git a/code/qcommon/net_ip.c b/code/qcommon/net_ip.c
index fe5c8da6..7889726b 100644
--- a/code/qcommon/net_ip.c
+++ b/code/qcommon/net_ip.c
@@ -63,11 +63,11 @@ static qboolean	winsockInitialized = qfalse;
 #		define _BSD_SOCKLEN_T_
 #	endif
 
-#	include <arpa/inet.h>
+#	include <sys/socket.h>
 #	include <errno.h>
 #	include <netdb.h>
 #	include <netinet/in.h>
-#	include <sys/socket.h>
+#	include <arpa/inet.h>
 #	include <net/if.h>
 #	include <sys/ioctl.h>
 #	include <sys/types.h>