diff --git a/ChangeLog b/ChangeLog
index 1878bae26b..6bd4c821ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-20  Ulrich Drepper  <drepper@cygnus.com>
+
+	* math/Makefile (tests): Add test-misc.
+	* math/test-misc.c: New file.
+
 2000-01-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/ieee754/ldbl-96/s_modfl.c: Correct handling of arguments
@@ -15,8 +20,7 @@
 	end of the buffer.  Set errno correctly if floating-point number
 	would overflow buffer.
 
-	* posix/regex.h: Update comment of
-	RE_SYNTAX_POSIX_MINIMAL_EXTENDED.
+	* posix/regex.h: Update comment of RE_SYNTAX_POSIX_MINIMAL_EXTENDED.
 
 	* locale/weight.h (findidx): Little optimization.  Correctly return
 	offset in indirect table.
diff --git a/math/Makefile b/math/Makefile
index f9f0ce4790..0480ea99b0 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -78,7 +78,8 @@ distribute += $(long-c-yes:=.c)
 include ../Makeconfig
 
 # Rules for the test suite.
-tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test
+tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
+	test-misc
 # We do the `long double' tests only if this data type is available and
 # distinct from `double'.
 test-longdouble-yes = test-ldouble test-ildoubl
diff --git a/math/test-misc.c b/math/test-misc.c
new file mode 100644
index 0000000000..962e5f69de
--- /dev/null
+++ b/math/test-misc.c
@@ -0,0 +1,57 @@
+/* Miscellaneous tests which don't fit anywhere else.
+   Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <math.h>
+#include <stdio.h>
+
+
+int
+main (void)
+{
+  int result = 0;
+
+  if (sizeof (long double) >= 12)
+    {
+      long double x = 0x100000001ll + (long double) 0.5;
+      long double q;
+      long double r;
+
+      r = modfl (x, &q);
+      if (q != (long double) 0x100000001ll || r != 0.5)
+	{
+	  printf ("modfl (%Lg, ...) failed\n", x);
+	  result = 1;
+	}
+    }
+
+  {
+    double x = 0x100000001ll + (double) 0.5;
+    double q;
+    double r;
+
+    r = modf (x, &q);
+    if (q != (double) 0x100000001ll || r != 0.5)
+      {
+	printf ("modf (%g, ...) failed\n", x);
+	result = 1;
+      }
+  }
+
+  return result;
+}