diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 20f2bb67cdc6..688d8c20fced 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Mark Kettenis  <kettenis@openbsd.org>
+
+	* config/i386/openbsdelf.h (LIBGCC2_HAS_TF_MODE, LIBGCC2_TF_CEXT,
+	TF_SIZE): Define.
+			
 2013-01-07  Steve Ellcey  <sellcey@mips.com>
 
 	PR target/42661
diff --git a/gcc/config/i386/openbsdelf.h b/gcc/config/i386/openbsdelf.h
index a321e77a9b6f..df2718cb933c 100644
--- a/gcc/config/i386/openbsdelf.h
+++ b/gcc/config/i386/openbsdelf.h
@@ -111,3 +111,9 @@ along with GCC; see the file COPYING3.  If not see
 #define OBSD_HAS_CORRECT_SPECS
 
 #define HAVE_ENABLE_EXECUTE_STACK
+
+/* Put all *tf routines in libgcc.  */
+#undef LIBGCC2_HAS_TF_MODE
+#define LIBGCC2_HAS_TF_MODE 1
+#define LIBGCC2_TF_CEXT q
+#define TF_SIZE 113
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index fd62a7e0cffd..d0d82fedcb0b 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-07  Mark Kettenis  <kettenis@openbsd.org>
+
+	* config.host (i[34567]86-*-openbsd* and x86_64-*-openbsd*):
+	Add to lists of i[34567]86-*-* and x86_64-*-* soft-fp targets.
+			
 2013-01-04  Nick Clifton  <nickc@redhat.com>
 
 	* config/v850/lib1funcs.S: Only provide CALLT support functions if
diff --git a/libgcc/config.host b/libgcc/config.host
index 0f19d4431790..ffd047f201f5 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1144,7 +1144,8 @@ i[34567]86-*-darwin* | x86_64-*-darwin* | \
   i[34567]86-*-gnu* | \
   i[34567]86-*-solaris2* | x86_64-*-solaris2.1[0-9]* | \
   i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw* | \
-  i[34567]86-*-freebsd* | x86_64-*-freebsd*)
+  i[34567]86-*-freebsd* | x86_64-*-freebsd* | \
+  i[34567]86-*-openbsd* | x86_64-*-openbsd*)
   	tmake_file="${tmake_file} t-softfp-tf"
 	if test "${host_address}" = 32; then
 		tmake_file="${tmake_file} i386/${host_address}/t-softfp"