diff --git a/ChangeLog b/ChangeLog
index 41c48ef871ecaacd188ce1bbcb6749665f2b7bb4..76a160938f47612b99e206c0118110781bfacee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 11 01:07:55 1999  Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+
+	* configure.in: cleanup, add mh-*pic handling for arm, special
+	case powerpc*-*-aix*
+
 1999-03-02  Nick Clifton  <nickc@cygnus.com>
 
 	* config.sub: Rename CYGNUS LOCAL to EGCS LOCAL
diff --git a/configure.in b/configure.in
index f1181a30c76bfe01a1f5924b3c4872ba589308e2..2fb19bf3cd10c6004eb51e71d057d0e6a1460879 100644
--- a/configure.in
+++ b/configure.in
@@ -283,25 +283,31 @@ esac
 
 if [ x${shared} = xyes ]; then
   case "${host}" in
-    hppa*)
+    alpha*-*-linux*)
+      host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
+      ;;
+    arm*-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-armpic"
+      ;;
+    hppa*-*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-papic"
       ;;
     i[3456]86-*-cygwin32*)
       # We don't want -fPIC on cygwin32.
       ;;
-    i[3456]86-*)
+    i[3456]86-*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
       ;;
-    sparc64-*)
+    sparc64-*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
       ;;
-    powerpc*-*)
-      host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
+    powerpc*-*-aix*)
+      # We don't want -fPIC on AIX.
       ;;
-    alpha*-*-linux*)
-      host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
+    powerpc*-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
       ;;
-    *)
+    *-*-*)
       if test -f ${srcdir}/config/mh-${host_cpu}pic; then
         host_makefile_frag="${host_makefile_frag} config/mh-${host_cpu}pic"
       fi