diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 29f12cba5144..0447cdc697e0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,18 @@
+2015-06-25  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	Backport from mainline
+	2015-05-28  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* configure.host: Add bits for FreeBSD amd64 and i386.
+	* configure.ac: Add signal handler for FreeBSD (amd64/i386)
+	* configure: Regenerate.
+	* include/freebsd-signal.h: New file.
+
+	2015-05-26  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add
+	libiconv for FreeBSD to cxxflags.
+
 2015-04-22  Release Manager
 
 	* GCC 5.1.0 released.
diff --git a/libjava/configure b/libjava/configure
index 00f41cd92fcb..ac0433a83378 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -24442,6 +24442,9 @@ case "${host}" in
  powerpc*-*-aix*)
     SIGNAL_HANDLER=include/aix-signal.h
     ;;
+ i?86-*-freebsd* | x86_64-*-freebsd*)
+    SIGNAL_HANDLER=include/freebsd-signal.h
+    ;;
  *)
     SIGNAL_HANDLER=include/default-signal.h
     ;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 01c436d852d3..3d26f3950138 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -1755,6 +1755,9 @@ case "${host}" in
  powerpc*-*-aix*)
     SIGNAL_HANDLER=include/aix-signal.h
     ;;
+ i?86-*-freebsd* | x86_64-*-freebsd*)
+    SIGNAL_HANDLER=include/freebsd-signal.h
+    ;;
  *)
     SIGNAL_HANDLER=include/default-signal.h
     ;;
diff --git a/libjava/configure.host b/libjava/configure.host
index c6f359c5492a..96222b82f7d5 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -338,6 +338,8 @@ EOF
 	;;
   *-*-freebsd*)
 	slow_pthread_self=
+	can_unwind_signal=yes
+	DIVIDESPEC=-fuse-divide-subroutine
 	;;
   *-mingw*)
         libgcj_flags="${libgcj_flags} -fno-omit-frame-pointer"
diff --git a/libjava/include/freebsd-signal.h b/libjava/include/freebsd-signal.h
new file mode 100644
index 000000000000..c4f7e999c90d
--- /dev/null
+++ b/libjava/include/freebsd-signal.h
@@ -0,0 +1,48 @@
+/* freebsd-signal.h - Catch runtime signals and turn them into exceptions,
+   on a FreeBSD system.  */
+
+/* Copyright (C) 2015 Free Software Foundation
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+/* This file is really more of a specification.  The rest of the system
+   should be arranged so that this Just Works.  */
+
+#ifndef JAVA_SIGNAL_H
+# define JAVA_SIGNAL_H 1
+
+#include <sys/types.h>
+#include <sys/signal.h>
+
+# define HANDLE_SEGV 1
+# define HANDLE_FPE  1
+
+# define SIGNAL_HANDLER(_name)					\
+  static void _name (int _dummy __attribute__ ((unused)))
+
+# define MAKE_THROW_FRAME(_exception)
+
+# define INIT_SEGV				\
+  do {						\
+    struct sigaction sa;			\
+    sa.sa_handler = catch_segv;		\
+    sigemptyset (&sa.sa_mask);			\
+    sa.sa_flags = SA_NODEFER;			\
+    sigaction (SIGBUS, &sa, NULL);		\
+    sigaction (SIGSEGV, &sa, NULL);		\
+    } while (0)
+
+# define INIT_FPE				\
+  do {						\
+    struct sigaction sa;			\
+    sa.sa_handler = catch_fpe;			\
+    sigemptyset (&sa.sa_mask);			\
+    sa.sa_flags = SA_NODEFER;			\
+    sigaction (SIGFPE, &sa, NULL);		\
+    } while (0)
+
+#endif /* JAVA_SIGNAL_H */
diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index ebdee1b44c96..8bd74481deb4 100644
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -274,6 +274,11 @@ proc gcj_jni_get_cxxflags_invocation {} {
     eval lappend cxxflags "-shared-libgcc -lgcj $libiconv"
   }
 
+  # FreeBSD needs -liconv linked, otherwise we get some unresolved.
+  if { [istarget "*-*-freebsd*"] } {
+    eval lappend cxxflags "$libiconv"
+  }
+
   # Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
   # the libc one.
   if { [istarget "*-*-solaris*"] } {