diff --git a/ChangeLog b/ChangeLog
index 41dfed564c4..9a6972e46d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-12  Andrew Haley  <aph@cygnus.com>
+
+	* configure.in (host_makefile_frag): Use mh-ia64pic on IA-64 hosts.
+	(target_makefile_frag): Use mt-ia64pic on IA-64 targets.
+
 Fri Jul 14 18:13:23 2000  Mark P Mitchell  <mark@codesourcery.com>
 
 	* config/mh-irix6 (CC): Don't set it.
diff --git a/configure.in b/configure.in
index 8059793d129..5aabef8eb2a 100644
--- a/configure.in
+++ b/configure.in
@@ -306,6 +306,9 @@ if [ x${shared} = xyes ]; then
     i[3456]86-*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
       ;;
+    ia64-*-*)
+      host_makefile_frag="${host_makefile_frag} config/mh-ia64pic"
+      ;;
     sparc64-*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
       ;;
@@ -1024,6 +1027,9 @@ if [ x${shared} = xyes ]; then
     i[3456]86-*)
       target_makefile_frag="${target_makefile_frag} config/mt-x86pic"
       ;;
+    ia64-*)
+      target_makefile_frag="${target_makefile_frag} config/mt-ia64pic"
+      ;;
     powerpc*-*-aix*)
       # We don't want -fPIC on AIX.
       ;;