--- Makefile.orig	2009-08-30 19:33:49.000000000 +0200
+++ Makefile	2009-08-30 23:59:48.000000000 +0200
@@ -17,6 +17,12 @@
   COMPILE_ARCH=$(shell uname -p | sed -e s/i.86/i386/)
 endif
 
+ifeq ($(COMPILE_PLATFORM),freebsd)
+  ifeq ($(COMPILE_ARCH),amd64)
+    COMPILE_ARCH=x86_64
+  endif
+endif
+
 ifeq ($(COMPILE_PLATFORM),mingw32)
   ifeq ($(COMPILE_ARCH),i386)
     COMPILE_ARCH=x86
@@ -521,15 +527,29 @@
 
 ifeq ($(PLATFORM),freebsd)
 
-  ifneq (,$(findstring alpha,$(shell uname -m)))
-    ARCH=axp
-  else #default to i386
-    ARCH=i386
-  endif #alpha test
+  FREEBSD_ARCH = $(ARCH)
+  ifeq ($(ARCH),amd64)
+    ARCH = x86_64
+  endif
+
+  ifeq ($(FREEBSD_ARCH),x86_64)
+    FREEBSD_ARCH = amd64
+  endif
+
+  ifndef HOMEPATH
+    HOMEPATH = /.ioquake3
+  endif
 
+  ifndef DEFAULT_LIBDIR
+    DEFAULT_LIBDIR = /usr/local/lib/ioquake3
+  endif
 
   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
-    -DUSE_ICON $(shell sdl-config --cflags)
+    -DUSE_ICON $(shell sdl-config --cflags) -DMAP_ANONYMOUS=MAP_ANON \
+    -DHOMEPATH=\\\"$(HOMEPATH)\\\" \
+    -DDEFAULT_LIBDIR=\\\"$(DEFAULT_LIBDIR)\\\" \
+    $(shell make -f /dev/null -VCFLAGS MACHINE_ARCH=$(FREEBSD_ARCH))
+    
 
   ifeq ($(USE_OPENAL),1)
     BASE_CFLAGS += -DUSE_OPENAL
@@ -548,8 +568,15 @@
       -fomit-frame-pointer -fexpensive-optimizations
   else
   ifeq ($(ARCH),i386)
-    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 -mtune=pentiumpro \
-      -march=pentium -fomit-frame-pointer -pipe -ffast-math \
+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
+      -fomit-frame-pointer -pipe -ffast-math \
+      -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
+      -funroll-loops -fstrength-reduce
+    HAVE_VM_COMPILED=true
+  else
+  ifeq ($(ARCH),x86_64)
+    RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG -O3 \
+      -fomit-frame-pointer -pipe -ffast-math \
       -falign-loops=2 -falign-jumps=2 -falign-functions=2 \
       -funroll-loops -fstrength-reduce
     HAVE_VM_COMPILED=true
@@ -557,6 +584,7 @@
     BASE_CFLAGS += -DNO_VM_COMPILED
   endif
   endif
+  endif
 
   DEBUG_CFLAGS=$(BASE_CFLAGS) -g
 
--- README.orig	2009-08-30 23:34:03.000000000 +0200
+++ README	2009-08-31 00:05:03.000000000 +0200
@@ -79,6 +79,8 @@
   CFLAGS            - use this for custom CFLAGS
   V                 - set to show cc command line when building
   DEFAULT_BASEDIR   - extra path to search for baseq3 and such
+  DEFAULT_LIBDIR    - extra path to search for libraries (FreeBSD only)
+  HOMEPATH          - alternative home directory (FreeBSD only)
   BUILD_SERVER      - build the 'ioq3ded' server binary
   BUILD_CLIENT      - build the 'ioquake3' client binary
   BUILD_CLIENT_SMP  - build the 'ioquake3-smp' client binary
--- code/qcommon/files.c.orig	2009-08-30 22:58:50.000000000 +0200
+++ code/qcommon/files.c	2009-08-30 23:10:53.000000000 +0200
@@ -241,6 +241,9 @@
 #endif
 
 static	cvar_t		*fs_basepath;
+#ifdef __FreeBSD__
+static	cvar_t		*fs_libpath;
+#endif
 static	cvar_t		*fs_basegame;
 static	cvar_t		*fs_gamedirvar;
 static	searchpath_t	*fs_searchpaths;
@@ -2761,6 +2764,10 @@
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT );
 	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
+	#ifdef __FreeBSD__
+	fs_libpath = Cvar_Get ("fs_libpath", Sys_DefaultLibPath(), CVAR_INIT );
+	#endif
+	
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;
--- code/qcommon/q_platform.h.orig	2009-08-30 19:30:01.000000000 +0200
+++ code/qcommon/q_platform.h	2009-08-30 19:28:38.000000000 +0200
@@ -199,6 +199,8 @@
 
 #ifdef __i386__
 #define ARCH_STRING "i386"
+#elif defined __amd64__
+#define ARCH_STRING "x86_64"
 #elif defined __axp__
 #define ARCH_STRING "alpha"
 #endif
--- code/qcommon/qcommon.h.orig	2009-08-30 23:12:19.000000000 +0200
+++ code/qcommon/qcommon.h	2009-08-30 23:26:12.000000000 +0200
@@ -1068,6 +1068,10 @@
 #ifdef MACOS_X
 char    *Sys_DefaultAppPath(void);
 #endif
+#ifdef __FreeBSD__
+void	Sys_SetDefaultLibPath(const char *path);
+char	*Sys_DefaultLibPath(void);
+#endif
 
 void  Sys_SetDefaultHomePath(const char *path);
 char	*Sys_DefaultHomePath(void);
--- code/qcommon/vm_x86_64.c.orig	2009-08-30 20:50:41.000000000 +0200
+++ code/qcommon/vm_x86_64.c	2009-08-30 20:51:43.000000000 +0200
@@ -246,7 +246,7 @@
 #else
 #define JMPIARG \
 	emit("movq $%lu, %%rax", vm->codeBase+vm->instructionPointers[iarg]); \
-	emit("jmpq *%rax");
+	emit("jmpq *%%rax");
 #endif
  
 // integer compare and jump
--- code/sys/sys_main.c.orig	2009-08-30 22:32:59.000000000 +0200
+++ code/sys/sys_main.c	2009-08-30 23:21:12.000000000 +0200
@@ -49,6 +49,9 @@
 
 static char binaryPath[ MAX_OSPATH ] = { 0 };
 static char installPath[ MAX_OSPATH ] = { 0 };
+#ifdef __FreeBSD__
+static char libPath[ MAX_OSPATH ] = { 0 };
+#endif
 
 /*
 =================
@@ -93,6 +96,31 @@
 		return Sys_Cwd();
 }
 
+#ifdef __FreeBSD__
+/*
+=================
+Sys_SetDefaultLibPath
+=================
+*/
+void Sys_SetDefaultLibPath(const char *path)
+{
+	Q_strncpyz(libPath, path, sizeof(libPath));
+}
+
+/*
+=================
+Sys_DefaultLibPath
+=================
+*/
+char *Sys_DefaultLibPath(void)
+{
+	if (*libPath)
+		return libPath;
+	else
+		return Sys_Cwd();
+}
+#endif
+
 /*
 =================
 Sys_DefaultAppPath
@@ -384,6 +412,7 @@
 #1 look down current path
 #2 look in fs_homepath
 #3 look in fs_basepath
+#4 look in fs_libpath under FreeBSD
 =================
 */
 void *Sys_LoadDll( const char *name, char *fqpath ,
@@ -394,6 +423,9 @@
 	void  (*dllEntry)( intptr_t (*syscallptr)(intptr_t, ...) );
 	char  fname[MAX_OSPATH];
 	char  *basepath;
+	#ifdef __FreeBSD__
+	char  *libpath;
+	#endif
 	char  *homepath;
 	char  *pwdpath;
 	char  *gamedir;
@@ -405,6 +437,9 @@
 	// TODO: use fs_searchpaths from files.c
 	pwdpath = Sys_Cwd();
 	basepath = Cvar_VariableString( "fs_basepath" );
+	#ifdef __FreeBSD__
+	libpath = Cvar_VariableString( "fs_libpath" );
+	#endif
 	homepath = Cvar_VariableString( "fs_homepath" );
 	gamedir = Cvar_VariableString( "fs_game" );
 
@@ -416,6 +451,11 @@
 	if(!libHandle && basepath)
 		libHandle = Sys_TryLibraryLoad(basepath, gamedir, fname, fqpath);
 
+	#ifdef __FreeBSD__
+	if(!libHandle && libpath)
+		libHandle = Sys_TryLibraryLoad(libpath, gamedir, fname, fqpath);
+	#endif
+
 	if(!libHandle) {
 		Com_Printf ( "Sys_LoadDll(%s) failed to load library\n", name );
 		return NULL;
@@ -469,6 +509,16 @@
 #	endif
 #endif
 
+#ifdef __FreeBSD__
+#ifndef DEFAULT_LIBDIR
+#	ifdef MACOS_X
+#		define DEFAULT_LIBDIR Sys_StripAppBundle(Sys_BinaryPath())
+#	else
+#		define DEFAULT_LIBDIR Sys_BinaryPath()
+#	endif
+#endif
+#endif
+
 /*
 =================
 Sys_SigHandler
@@ -540,6 +590,9 @@
 	Sys_ParseArgs( argc, argv );
 	Sys_SetBinaryPath( Sys_Dirname( argv[ 0 ] ) );
 	Sys_SetDefaultInstallPath( DEFAULT_BASEDIR );
+	#ifdef __FreeBSD__
+	Sys_SetDefaultLibPath( DEFAULT_LIBDIR );
+	#endif
 
 	// Concatenate the command line for passing to Com_Init
 	for( i = 1; i < argc; i++ )
--- code/sys/sys_unix.c.orig	2009-08-30 21:54:20.000000000 +0200
+++ code/sys/sys_unix.c	2009-08-30 22:10:31.000000000 +0200
@@ -56,8 +56,12 @@
 #ifdef MACOS_X
 			Q_strcat( homePath, sizeof( homePath ), "/Library/Application Support/Quake3" );
 #else
+#ifdef __FreeBSD__
+			Q_strcat( homePath, sizeof( homePath ), HOMEPATH );
+#else
 			Q_strcat( homePath, sizeof( homePath ), "/.q3a" );
 #endif
+#endif
 			if( mkdir( homePath, 0777 ) )
 			{
 				if( errno != EEXIST )