diff --git a/src/Makefile b/src/Makefile
index e4278f97e8..a01c1a0ba0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -29,7 +29,7 @@ srcdir   = .
 CC       = gcc
 INCLPATH = -I/usr/include \
            -I.. \
-           -I/usr/X11R6/include \
+           -I/usr/X11R6/include/. \
            -I./../include \
            -I./../lib/ComboBox-1.33 \
            -I./../lib/XmHTML-1.1.0/src \
@@ -38,7 +38,7 @@ INCLPATH = -I/usr/include \
 CFLAGS   = -O2 -DCELL_WIDGETS=1
 LFLAGS   = -O2
 LIBS     = -lXpm -lXm -lXmu -lXt -lXext  -lSM -lICE -lX11  -lpng -ljpeg -lz -lm
-LIBPATH  = -L/lib -L/usr/lib -L/usr/X11R6/lib
+LIBPATH  = -L/lib -L/usr/lib -L/usr/X11R6/lib/.
 TARGET   = ../xacc
 
 LIBHTMLW = ../lib/libhtmlw/libhtmlw.a
diff --git a/src/Makefile.in b/src/Makefile.in
index 956fcef343..d844e028a8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -29,7 +29,7 @@ VPATH    = @srcdir@
 CC       = @CC@
 INCLPATH = -I/usr/include \
            -I.. \
-           -I@x_includes@ \
+           -I@x_includes@/. \
            -I@srcdir@/../include \
            -I@srcdir@/../lib/ComboBox-1.33 \
            -I@srcdir@/../lib/XmHTML-1.1.0/src \
@@ -38,7 +38,7 @@ INCLPATH = -I/usr/include \
 CFLAGS   = @cflags@ -DCELL_WIDGETS=1
 LFLAGS   = @lflags@
 LIBS     = @LIBS@
-LIBPATH  = -L/lib -L/usr/lib -L@x_libraries@
+LIBPATH  = -L/lib -L/usr/lib -L@x_libraries@/.
 TARGET   = ../xacc
 
 LIBHTMLW = ../lib/libhtmlw/libhtmlw.a