diff -p -up blender-2.49/extern/solid/examples/Makefile.am.lib64 blender-2.49/extern/solid/examples/Makefile.am
--- blender-2.49/extern/solid/examples/Makefile.am.lib64	2007-08-28 12:07:08.000000000 +0200
+++ blender-2.49/extern/solid/examples/Makefile.am	2009-04-10 11:28:59.000000000 +0200
@@ -7,7 +7,7 @@ gldemo_SOURCES = gldemo.cpp
 physics_SOURCES = physics.cpp
 mnm_SOURCES = mnm.cpp
 
-GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib -lXmu -lXi -lX11
+GLLIBS = -lglut -lGLU -lGL -L/usr/X11R6/lib64 -lXmu -lXi -lX11
 
 sample_LDADD = ../src/libsolid.la $(QHULL_LIBS)
 gldemo_LDADD = ../src/libsolid.la $(QHULL_LIBS) $(GLLIBS)
diff -p -up blender-2.49/intern/bsp/test/Makefile.lib64 blender-2.49/intern/bsp/test/Makefile
--- blender-2.49/intern/bsp/test/Makefile.lib64	2008-04-17 00:40:48.000000000 +0200
+++ blender-2.49/intern/bsp/test/Makefile	2009-04-10 11:28:59.000000000 +0200
@@ -48,7 +48,7 @@ SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)li
 SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
 
 ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
-    LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
+    LLIBS = -L/usr/X11R6/lib64 -lglut -pthread -lXi -lXmu
 endif
 
 all debug:: $(LIBS) $(DIR)/$(DEBUG_DIR)BSPGhostTest
diff -p -up blender-2.49/intern/iksolver/test/Makefile.lib64 blender-2.49/intern/iksolver/test/Makefile
--- blender-2.49/intern/iksolver/test/Makefile.lib64	2008-04-17 00:40:48.000000000 +0200
+++ blender-2.49/intern/iksolver/test/Makefile	2009-04-10 11:28:59.000000000 +0200
@@ -47,7 +47,7 @@ LIBS += $(OCGDIR)/intern/$(LIBNAME)/$(DE
 SLIBS += $(NAN_MOTO)/lib/$(DEBUG_DIR)libmoto.a
 
 ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
-    LLIBS = -L/usr/X11R6/lib -lglut -pthread
+    LLIBS = -L/usr/X11R6/lib64 -lglut -pthread
 endif
 
 ifeq ($(OS),$(findstring $(OS), "solaris"))
diff -p -up blender-2.49/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile.lib64 blender-2.49/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile
--- blender-2.49/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile.lib64	2008-07-05 19:05:05.000000000 +0200
+++ blender-2.49/source/gameengine/Physics/Sumo/Fuzzics/sample/Makefile	2009-04-10 11:28:59.000000000 +0200
@@ -14,7 +14,7 @@ clean::
 	@$(RM) $(DIR)/particle $(DIR)/particle0
 	@$(RM) $(DIR)/debug/particle $(DIR)/debug/particle0
 
-LDFLAGS  = -L$(DIR) -L/usr/X11R6/lib
+LDFLAGS  = -L$(DIR) -L/usr/X11R6/lib64
 OGL_LDLIBS = -lglut -lGLU -lGL -pthread
 LDLIBS   = -lfuzzics -lsolid $(NAN_MOTO)/lib/libmoto.a $(OGL_LDLIBS)
 
diff -p -up blender-2.49/source/nan_link.mk.lib64 blender-2.49/source/nan_link.mk
--- blender-2.49/source/nan_link.mk.lib64	2008-11-24 15:15:05.000000000 +0100
+++ blender-2.49/source/nan_link.mk	2009-04-10 11:33:22.000000000 +0200
@@ -91,18 +91,18 @@ endif
 ifeq ($(OS),linux)
   ifeq ($(CPU),alpha)
     COMMENT = "MESA 3.1"
-    LLIBS = -lGL -lGLU -L/usr/X11R6/lib/ -lXmu -lXext -lX11
+    LLIBS = -lGL -lGLU -L/usr/X11R6/lib64/ -lXmu -lXext -lX11
     LLIBS += -lc -lm -ldl -lutil
     LOPTS = -export-dynamic
   endif
   ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64 parisc64 powerpc sparc64"))
     COMMENT = "MESA 3.1"
-    LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
+    LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib64 -lXmu -lXext -lX11 -lXi
     LLIBS += -lutil -lc -lm -ldl -lpthread
-#    LLIBS += -L$(NAN_ODE)/lib -lode
+#    LLIBS += -L$(NAN_ODE)/lib64 -lode
     LOPTS = -export-dynamic
     DADD = -lGL -lGLU
-    SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
+    SADD = $(NAN_MESA)/lib64/libGL.a $(NAN_MESA)/lib64/libGLU.a
     DYNLDFLAGS = -shared $(LDFLAGS)
   endif
     LLIBS += -lz