diff --git a/config/linux2-config.py b/config/linux2-config.py
index 69ef71c4371..0cd7113ad7f 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -101,9 +101,9 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 WITH_BF_OPENGL = 'true'
 BF_OPENGL = '/usr/X11R6'
 BF_OPENGL_INC = '${BF_OPENGL}/include'
-BF_OPENGL_LIB = 'GL GLU Xmu Xext X11 Xi'
+BF_OPENGL_LIB = 'GL GLU X11 Xi'
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
-BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/lib/libGL.a ${BF_OPENGL}/lib/libGLU.a ${BF_OPENGL}/lib/libXmu.a ${BF_OPENGL}/lib/libXext.a ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a'
+BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/lib/libGL.a ${BF_OPENGL}/lib/libGLU.a ${BF_OPENGL}/lib/libX11.a ${BF_OPENGL}/lib/libXi.a'
 ##
 ##CC = gcc
 ##CCC = g++
diff --git a/tools/Blender.py b/tools/Blender.py
index 060d04a09bc..e3d4740d0e5 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -137,11 +137,12 @@ def setup_syslibs(lenv):
         lenv['BF_GETTEXT_LIB']
         ]
     if lenv['WITH_BF_OPENAL']:
-       lenv['BF_OPENAL_LIB'],
+       syslibs += Split(lenv['BF_OPENAL_LIB'])
     if lenv['OURPLATFORM']=='win32vc':
             syslibs += Split(lenv['BF_ICONV_LIB'])
     syslibs += Split(lenv['BF_TIFF_LIB'])
-    syslibs += Split(lenv['BF_OPENEXR_LIB'])
+    if lenv['WITH_BF_OPENEXR']:
+        syslibs += Split(lenv['BF_OPENEXR_LIB'])
     syslibs += Split(lenv['BF_SDL_LIB'])
     syslibs += Split(lenv['BF_OPENGL_LIB'])
     syslibs += Split(lenv['LLIBS'])