diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 239cfc33f0490d8f9863240113afb58aada384b1..9f03a5ce36813a813e50f07f66bbe3c5acafdb5a 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure, config.h.in: Regenerate.
+	* config/fpu-sysv.h: Include <assert.h>.
+
 2014-07-02  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* config/fpu-glibc.h: Fix comment about FE_DENORMAL.
diff --git a/libgfortran/config.h.in b/libgfortran/config.h.in
index 110fb6d5b9a87552eb1278d918086caa1fdc8ce7..de7937f328aa67de132d576c4756bc7ab1968fd5 100644
--- a/libgfortran/config.h.in
+++ b/libgfortran/config.h.in
@@ -396,9 +396,15 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
+/* fpresetsticky is present */
+#undef HAVE_FPRESETSTICKY
+
 /* Define if you have fpsetmask. */
 #undef HAVE_FPSETMASK
 
+/* fpsetsticky is present */
+#undef HAVE_FPSETSTICKY
+
 /* Define to 1 if you have the <fptrap.h> header file. */
 #undef HAVE_FPTRAP_H
 
diff --git a/libgfortran/config/fpu-sysv.h b/libgfortran/config/fpu-sysv.h
index 0105cf74b8b9dc6ef8ca67e1ad00b9406346683d..8d8ff329f1fb515c93f8dfdc949be90c1b4e900d 100644
--- a/libgfortran/config/fpu-sysv.h
+++ b/libgfortran/config/fpu-sysv.h
@@ -25,6 +25,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 /* FPU-related code for SysV platforms with fpsetmask().  */
 
+#include <assert.h>
+
 /* BSD and Solaris systems have slightly different types and functions
    naming.  We deal with these here, to simplify the code below.  */
 
diff --git a/libgfortran/configure b/libgfortran/configure
index f123c48dba225aebd893ff46217299e2a75068ed..d6d26db8c3f215c6048ad767d0a2dce0a61c7c38 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -26100,6 +26100,22 @@ _ACEOF
 fi
 
 
+# Check whether we have fpsetsticky or fpresetsticky
+ac_fn_c_check_func "$LINENO" "fpsetsticky" "ac_cv_func_fpsetsticky"
+if test "x$ac_cv_func_fpsetsticky" = x""yes; then :
+  have_fpsetsticky=yes
+$as_echo "#define HAVE_FPSETSTICKY 1" >>confdefs.h
+
+fi
+
+ac_fn_c_check_func "$LINENO" "fpresetsticky" "ac_cv_func_fpresetsticky"
+if test "x$ac_cv_func_fpresetsticky" = x""yes; then :
+  have_fpresetsticky=yes
+$as_echo "#define HAVE_FPRESETSTICKY 1" >>confdefs.h
+
+fi
+
+
 # Check for AIX fp_trap and fp_enable
 ac_fn_c_check_func "$LINENO" "fp_trap" "ac_cv_func_fp_trap"
 if test "x$ac_cv_func_fp_trap" = x""yes; then :