diff -Naur work.orig/linux/sys_linux.c work/linux/sys_linux.c
--- work.orig/linux/sys_linux.c	2008-10-09 05:56:18.000000000 +0100
+++ work/linux/sys_linux.c	2012-09-16 10:21:06.844087744 +0100
@@ -484,15 +484,8 @@
 	char	name[MAX_OSPATH];
 	char	curpath[MAX_OSPATH];
 	char	*path;
-#ifdef __i386__
-	const char *gamename = "gamei386.so";
-#elif defined __alpha__
-	const char *gamename = "gameaxp.so";
-#elif defined __x86_64__
-	const char *gamename = "gamex86_64.so";
-#else
-#error "Don't know what kind of dynamic objects to use for this architecture."
-#endif
+
+	const char *gamename = "game.so";
 
 	if (game_library)
 		Com_Error (ERR_FATAL, "Sys_GetGameAPI without Sys_UnloadingGame");
@@ -504,7 +497,7 @@
 
 	if (baseq2)
 	{
-		Com_sprintf (name, sizeof(name), "%s/%s/%s", curpath, BASEDIRNAME, gamename);
+		Com_sprintf (name, sizeof(name), "%s/%s/%s", R1Q2LIB, BASEDIRNAME, gamename);
 		game_library = dlopen (name, RTLD_NOW );
 
 		if (game_library == NULL) {
@@ -522,7 +515,7 @@
 			path = FS_NextPath (path);
 			if (!path)
 				return NULL;		// couldn't find one anywhere
-			Com_sprintf (name, sizeof(name), "%s/%s/%s", curpath, path, gamename);
+			Com_sprintf (name, sizeof(name), "%s/%s", path, gamename);
 			game_library = dlopen (name, RTLD_NOW );
 			if (game_library)
 			{
diff -Naur work.orig/linux/vid_so.c work/linux/vid_so.c
--- work.orig/linux/vid_so.c	2007-05-12 18:18:16.000000000 +0100
+++ work/linux/vid_so.c	2012-09-16 10:21:00.578181949 +0100
@@ -220,7 +220,7 @@
 		fn[strlen(fn) - 1] = 0;
 	*/
 
-	strcpy (fn, ".");
+	strcpy (fn, R1Q2LIB);
 	strcat(fn, "/");
 	strcat(fn, name);
 
@@ -419,7 +419,7 @@
 	/* Create the video variables so we know how to start the graphics drivers */
 	// if DISPLAY is defined, try X
 	if (getenv("DISPLAY"))
-		vid_ref = Cvar_Get ("vid_ref", "softx", CVAR_ARCHIVE);
+		vid_ref = Cvar_Get ("vid_ref", "gl", CVAR_ARCHIVE);
 	else
 		vid_ref = Cvar_Get ("vid_ref", "soft", CVAR_ARCHIVE);
 	vid_xpos = Cvar_Get ("vid_xpos", "3", CVAR_ARCHIVE);
diff -Naur work.orig/qcommon/files.c work/qcommon/files.c
--- work.orig/qcommon/files.c	2008-11-08 09:59:36.000000000 +0000
+++ work/qcommon/files.c	2012-09-16 10:21:00.578181949 +0100
@@ -1716,6 +1716,8 @@
 	// start up with baseq2 by default
 	//
 	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
+	FS_AddGameDirectory (R1Q2LIB "/" BASEDIRNAME);
+	FS_AddGameDirectory (SYSTEMDIR "/" BASEDIRNAME);
 
 	// any set gamedirs will be freed up to here
 	fs_base_searchpaths = fs_searchpaths;