diff -Naur source-orig/Makefile source/Makefile
--- source-orig/Makefile	2008-09-03 04:08:01.000000000 +0100
+++ source/Makefile	2008-09-14 17:27:37.000000000 +0100
@@ -29,6 +29,8 @@
 WITH_DATADIR?=no
 WITH_LIBDIR?=no
 
+WITH_CURRENTDIR?=yes
+
 # End of configurable options.
 
 VERSION=		1.40
@@ -71,6 +73,10 @@
 BASE_CFLAGS+=-DLIBDIR='\"$(LIBDIR)\"'
 endif
 
+ifeq ($(strip $(WITH_CURRENTDIR)),yes)
+BASE_CFLAGS+=-DCURRENTDIR='\".\"'
+endif
+
 RELEASE_CFLAGS=$(BASE_CFLAGS)
 
 ifeq ($(strip $(OPTIMIZED_CFLAGS)),yes)
diff -Naur source-orig/qcommon/files.c source/qcommon/files.c
--- source-orig/qcommon/files.c	2008-09-03 04:07:59.000000000 +0100
+++ source/qcommon/files.c	2008-09-14 17:36:05.000000000 +0100
@@ -757,7 +757,9 @@
 #ifdef LIBDIR
 		FS_AddGameDirectory (va("%s/%s", LIBDIR, dir) );
 #endif
+#ifdef CURRENTDIR
 		FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) );
+#endif
 #ifdef __unix__
 		FS_AddHomeAsGameDirectory(dir);
 #endif