diff --git a/aclocal.m4 b/aclocal.m4
index b245c4dea..d0270d894 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -511,6 +511,9 @@ AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
 
   if test "x$UNIVERSAL_ARCHS" = "x"; then
     case "$MACOSX_VERSION" in
+      10.1[[0-9]]*)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
       10.[[0-5]]*)
         UNIVERSAL_ARCHS="i386 ppc"
         ;;
diff --git a/configure b/configure
index ef7e03eee..7630fc7f5 100755
--- a/configure
+++ b/configure
@@ -2949,7 +2949,7 @@ $as_echo "$MACOSX_VERSION" >&6; }
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*|10.3*)
+  10.0*|10.1|10.1.*|10.2*|10.3*)
     as_fn_error $? "This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/" "$LINENO" 5
     ;;
@@ -8125,6 +8125,9 @@ fi
 
   if test "x$UNIVERSAL_ARCHS" = "x"; then
     case "$MACOSX_VERSION" in
+      10.1[0-9]*)
+        UNIVERSAL_ARCHS="x86_64 i386"
+        ;;
       10.[0-5]*)
         UNIVERSAL_ARCHS="i386 ppc"
         ;;
diff --git a/configure.ac b/configure.ac
index 836b8ff5c..5071efd56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ if test "x$SW_VERS" != "x"; then
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*|10.3*)
+  10.0*|10.1|10.1.*|10.2*|10.3*)
     AC_MSG_ERROR([This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/])
     ;;