diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4422532722..9f1c90f29a 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-14  P.J. Darcy  <darcypj@us.ibm.com>
+
+	* config.bfd: Add s390x-ibm-tpf support.
+
 2004-12-14  Tomer Levi  <Tomer.Levi@nsc.com>
 
 	* elf32-crx.c (elf32_crx_relax_delete_bytes): Add 'struct bfd_link_info *' 
diff --git a/bfd/config.bfd b/bfd/config.bfd
index cc8d4769f3..e1389fffe6 100644
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -1059,6 +1059,9 @@ case "${targ}" in
     targ_defvec=bfd_elf64_s390_vec
     targ_selvecs=bfd_elf32_s390_vec
     ;;
+  s390x-*-tpf*)
+    targ_defvec=bfd_elf64_s390_vec
+    ;;
 #endif
 
 #ifdef BFD64
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3aed9699cc..e7f185928a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  P.J. Darcy  <darcypj@us.ibm.com>
+
+	* configure.in: Add s390x-ibm-tpf support.
+	* configure: Regenerate.
+
 2004-12-15 Jan Beulich  <jbeulich@novell.com>
 
 	* config/obj-elf.c (obj_elf_change_section): Only set type and
diff --git a/gas/configure b/gas/configure
index 829692be92..dc07df9778 100755
--- a/gas/configure
+++ b/gas/configure
@@ -4533,6 +4533,7 @@ echo "$as_me: error: Solaris must be configured little endian" >&2;}
 
       s390x-*-linux-gnu*)		fmt=elf em=linux ;;
       s390-*-linux-gnu*)		fmt=elf em=linux ;;
+      s390-*-tpf*)			fmt=elf ;;
 
       sh*-*-linux*)			fmt=elf em=linux
 	    case ${cpu} in
diff --git a/gas/configure.in b/gas/configure.in
index b2afeae5c8..50dcfd5c70 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -462,6 +462,7 @@ changequote([,])dnl
 
       s390x-*-linux-gnu*)		fmt=elf em=linux ;;
       s390-*-linux-gnu*)		fmt=elf em=linux ;;
+      s390-*-tpf*)			fmt=elf ;;
 
       sh*-*-linux*)			fmt=elf em=linux
 	    case ${cpu} in
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 478993b90a..0844e9a69c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-14  P.J. Darcy  <darcypj@us.ibm.com>
+
+	* configure.tgt: Add s390x-ibm-tpf support.
+
 2004-12-16  Martin Kögler  <mkoegler@auto.tuwien.ac.at>
 
 	* ldmisc.c (vfinfo): Handle the case where %B is passed a NULL
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 841bce75e4..96b2c4c39a 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -565,6 +565,8 @@ s390x-*-linux*)         targ_emul=elf64_s390
 			targ_extra_emuls=elf_s390
 			targ_extra_libpath=$targ_extra_emuls
 			tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;;
+s390x-*-tpf*)		targ_emul=elf64_s390
+			tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;;
 s390-*-linux*)          targ_emul=elf_s390
 			if test "${want64}" = "true"; then
 			  targ_extra_emuls=elf64_s390