diff --git a/AmberTools/src/configure b/AmberTools/src/configure
index 676358d..75ecfb4 100755
--- a/AmberTools/src/configure
+++ b/AmberTools/src/configure
@@ -379,6 +379,8 @@ fi
 
 if [ -d /usr/X11R6/lib ]; then
     xhome='/usr/X11R6'
+elif [ -d /usr/lib/x86_64-linux-gnu ]; then
+    xhome='/usr'
 elif [ -f /usr/lib/libX11.a -o -f /usr/lib/libX11.so \
        -o -f /usr/lib64/libX11.a -o -f /usr/lib64/libX11.so ]; then
     xhome='/usr'
@@ -391,12 +393,16 @@ xlibs="-L$xhome/lib"
 if [ "$x86_64" = 'yes' ]; then
     xlibs="-L$xhome/lib64 $xlibs"
 fi
+if [ -d /usr/lib/x86_64-linux-gnu ]; then
+    xlibs="-L/usr/lib/x86_64-linux-gnu $xlibs"
+fi
 
 #--------------------------------------------------------------------------
 #  Check if the X11 library files for XLEaP are present:
 #--------------------------------------------------------------------------
 if [ "$noX11" = "false" ]; then
     if [ -r "$xhome/lib/libXt.a"  -o -r "$xhome/lib/libXt.dll.a" \
+         -o -r /usr/lib/x86_64-linux-gnu/libXt.a \
          -o -r /usr/lib/libXt.so \
          -o -r /usr/lib64/libXt.so \
          -o -r /usr/X11/lib/libXt.dylib \
@@ -706,11 +712,11 @@ intel)
       cc=icc
       pycc=icc
       cflags=
-      ambercflags="-Wall"
+#     ambercflags="-Wall"
       cplusplus=icpc
       pycplusplus=icpc
       cxxflags=
-      ambercxxflags="-Wall"
+#     ambercxxflags="-Wall"
       fc=ifort
       fflags=
       freeformat_flag='-FR'