diff --git a/configure b/configure
index 1f48fbeb9c..079e6dbc00 100755
--- a/configure
+++ b/configure
@@ -2456,13 +2456,9 @@ case "$arch" in
     mips*|IP*)
         arch="mips"
     ;;
-    parisc|hppa)
+    parisc*|hppa*)
         arch="parisc"
     ;;
-    parisc64|hppa64)
-        arch="parisc"
-        subarch="parisc64"
-    ;;
     "Power Macintosh"|ppc*|powerpc*)
         arch="ppc"
     ;;
@@ -2669,13 +2665,17 @@ check_64bit(){
 }
 
 case "$arch" in
-    alpha|ia64|parisc|sparc)
+    alpha|ia64|sparc)
         spic=$shared
     ;;
     mips)
         check_64bit mips mips64 '_MIPS_SIM > 1'
         spic=$shared
     ;;
+    parisc)
+        check_64bit parisc parisc64 'sizeof(void *) > 4'
+        spic=$shared
+    ;;
     ppc)
         check_64bit ppc ppc64 'sizeof(void *) > 4'
     ;;