diff --git a/makeParaView b/makeParaView
index 4045767..666e5e0 100755
--- a/makeParaView
+++ b/makeParaView
@@ -200,7 +200,9 @@ do
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
         withMESA=true
         MESA_INCLUDE="${2%%/}/include"
+        # Could be under (lib64 | lib)
         MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
+        [ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
         shift
         ;;
     -mesa-include)
diff --git a/makeParaView.example b/makeParaView.example
index b32d784..9caf442 100755
--- a/makeParaView.example
+++ b/makeParaView.example
@@ -4,7 +4,8 @@
 # - mesa
 
 # mesa=mesa-11.2.2
-mesa=mesa-13.0.3
+# mesa=mesa-13.0.3
+mesa=mesa-17.1.1
 
 ./makeParaView \
     -mpi=0 \
diff --git a/makeVTK b/makeVTK
index 65aea19..99ead3d 100755
--- a/makeVTK
+++ b/makeVTK
@@ -183,7 +183,9 @@ do
         [ "$#" -ge 2 ] || die "'$1' option requires an argument"
         withMESA=true
         MESA_INCLUDE="${2%%/}/include"
+        # Could be under (lib64 | lib)
         MESA_LIBRARY="${2%%/}/lib$WM_COMPILER_LIB_ARCH/libOSMesa.so"
+        [ -f "$MESA_LIBRARY" ] || MESA_LIBRARY="${2%%/}/lib/libOSMesa.so"
         shift
         ;;
     -mesa-include)
diff --git a/makeVTK.example b/makeVTK.example
index 3cd33d2..46d6e4c 100755
--- a/makeVTK.example
+++ b/makeVTK.example
@@ -2,9 +2,10 @@
 # An example for building particular combinations of VTK with
 # - mesa (off-screen only)
 
-vtk=VTK-7.1.0
+vtk=VTK-8.1.0
 # mesa=mesa-11.2.2
-mesa=mesa-13.0.3
+# mesa=mesa-13.0.3
+mesa=mesa-17.1.1
 
 ./makeVTK \
     $vtk \