diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/common/linux.conf qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf
--- qt-x11-opensource-src-4.3.2.orig/mkspecs/common/linux.conf	2008-01-29 17:57:54.387185584 +1100
+++ qt-x11-opensource-src-4.3.2/mkspecs/common/linux.conf	2008-01-29 18:00:28.979683952 +1100
@@ -7,12 +7,12 @@ QMAKE_CXXFLAGS_THREAD	+= $$QMAKE_CFLAGS_
 
 QMAKE_INCDIR          =
 QMAKE_LIBDIR          =
-QMAKE_INCDIR_X11      = /usr/X11R6/include
-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+QMAKE_INCDIR_X11      = /usr/X11/include
+QMAKE_LIBDIR_X11      = /usr/X11/lib
 QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL   = /usr/X11/include
+QMAKE_LIBDIR_OPENGL   = /usr/X11/lib
 
 QMAKE_LIBS            =
 QMAKE_LIBS_DYNLOAD    = -ldl
diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-cxx/qmake.conf qt-x11-opensource-src-4.3.2/mkspecs/linux-cxx/qmake.conf
--- qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-cxx/qmake.conf	2008-01-29 17:57:54.353190752 +1100
+++ qt-x11-opensource-src-4.3.2/mkspecs/linux-cxx/qmake.conf	2008-01-29 18:00:21.716788080 +1100
@@ -37,12 +37,12 @@ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YAC
 
 QMAKE_INCDIR		=
 QMAKE_LIBDIR		=
-QMAKE_INCDIR_X11	= /usr/X11R6/include
-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+QMAKE_INCDIR_X11	= /usr/X11/include
+QMAKE_LIBDIR_X11	= /usr/X11/lib
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+QMAKE_INCDIR_OPENGL	= /usr/X11/include
+QMAKE_LIBDIR_OPENGL	= /usr/X11/lib
 
 QMAKE_LINK		= cxx
 QMAKE_LINK_SHLIB	= cxx
diff -pruN qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-g++-64/qmake.conf qt-x11-opensource-src-4.3.2/mkspecs/linux-g++-64/qmake.conf
--- qt-x11-opensource-src-4.3.2.orig/mkspecs/linux-g++-64/qmake.conf	2008-01-29 17:57:54.358189992 +1100
+++ qt-x11-opensource-src-4.3.2/mkspecs/linux-g++-64/qmake.conf	2008-01-29 18:00:21.716788080 +1100
@@ -17,7 +17,7 @@ QMAKE_LFLAGS		= -m64
 include(../common/g++.conf)
 include(../common/linux.conf)
 
-QMAKE_LIBDIR_X11      = /usr/X11R6/lib64
-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib64
+QMAKE_LIBDIR_X11      = /usr/X11/lib64
+QMAKE_LIBDIR_OPENGL   = /usr/X11/lib64
 
 load(qt_config)