diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 56eaebff1a..110729e53c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,8 @@
 Thu Jul 18 15:39:10 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+	* config.bfd (mips*-*-irix6*): New target.
+	* configure.host: Handle Irix 6 shared library like Irix 5.
+
 	* xcofflink.c (xcoff_link_add_symbols): Don't check an XMC_TD
 	symbol for a magic name.
 	(xcoff_link_input_bfd): Don't change the reloc symbol for an
diff --git a/bfd/config.bfd b/bfd/config.bfd
index 389e83050a..793396687b 100755
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -359,6 +359,10 @@ case "${targ}" in
     targ_defvec=ecoff_big_vec
     targ_selvecs=ecoff_little_vec
     ;;
+  mips*-*-irix6*)
+    targ_defvec=bfd_elf32_bigmips_vec
+    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
+    ;;
   mips*-*-irix5*)
     targ_defvec=bfd_elf32_bigmips_vec
     targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
diff --git a/bfd/configure.host b/bfd/configure.host
index ca1136c2a3..b2b9e71077 100644
--- a/bfd/configure.host
+++ b/bfd/configure.host
@@ -56,9 +56,9 @@ SHLIB_CC='$(CC)'
 SHLIB_CFLAGS='-shared'
 if [ "${shared}" = "true" ]; then
   case "${host}" in
-  hppa*-*-*)		picfrag=../config/mh-papic ;;
-  i[3456]86-*-*)	picfrag=../config/mh-x86pic ;;
-  *-*-*)		picfrag=../config/mh-${host_cpu}pic ;;
+  hppa*-*-*)		picfrag=${srcdir}/../config/mh-papic ;;
+  i[3456]86-*-*)	picfrag=${srcdir}/../config/mh-x86pic ;;
+  *-*-*)		picfrag=${srcdir}/../config/mh-${host_cpu}pic ;;
   esac
   if [ -f "${picfrag}" ]; then
     pic=`sed -n -e 's/^PICFLAG[ 	]*=[ 	]*\(.*\)$/\1/p' ${picfrag}`
@@ -81,8 +81,8 @@ if [ "${shared}" = "true" ]; then
     HLDFLAGS='-Wl,+s,+b,$(libdir)'
     RPATH_ENVVAR=SHLIB_PATH
     ;;
-  *-*-irix5*)
-    # -fpic is not needed on Irix 5.
+  *-*-irix[56]*)
+    # -fpic is not needed on Irix 5 or 6.
     PICFLAG=
     SHLIB_CFLAGS='-shared -Wl,-soname,$(SONAME)'
     HLDFLAGS='-Wl,-rpath,$(libdir)'