--- jogl/make/build.xml~	2008-04-29 19:18:50.000000000 -0500
+++ jogl/make/build.xml	2011-04-08 09:07:52.000000000 -0500
@@ -727,7 +727,7 @@
       <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd">
         <!-- Need to force X11R6 headers on to include path after stub_includes -->
         <includepath path="stub_includes/opengl"/>
-        <includepath path="/usr/X11R6/include" />
+        <includepath path="/usr/include" />
       </compiler>
 
       <!-- linker configuration -->
--- jogl/make/build.xml~	2011-04-20 11:38:37.000000000 -0500
+++ jogl/make/build.xml	2011-04-20 12:02:43.000000000 -0500
@@ -735,14 +735,14 @@
       <!-- linker configuration -->
  
       <linker id="linker.cfg.linux.jogl" extends="linker.cfg.linux">
-        <syslibset dir="/usr/X11R6/lib" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib" libs="Xxf86vm" />
+        <syslibset dir="/usr/lib" libs="GL, X11"/>
+        <syslibset dir="/usr/lib" libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>
 
       <linker id="linker.cfg.linux.amd64.jogl" name="gcc">
-        <syslibset dir="/usr/X11R6/lib64" libs="GL, X11"/>
-        <syslibset dir="/usr/X11R6/lib64" libs="Xxf86vm" />
+        <syslibset dir="/usr/lib64" libs="GL, X11"/>
+        <syslibset dir="/usr/lib64" libs="Xxf86vm" />
         <syslibset dir="${x11.cg.lib}" libs="Cg, CgGL" if="c.compiler.use-cglib"/>
       </linker>