diff --git a/regress/lib/libc/Makefile b/regress/lib/libc/Makefile
index 4490f1669482..484916af6cc9 100644
--- a/regress/lib/libc/Makefile
+++ b/regress/lib/libc/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.33 2003/03/01 04:20:54 thorpej Exp $
+#	$NetBSD: Makefile,v 1.34 2003/05/03 19:33:51 martin Exp $
 
-SUBDIR+= _setjmp atexit basename clone db dirname div divrem \
+SUBDIR+= _setjmp atexit basename clone convfp db dirname div divrem \
 	gen getaddrinfo hsearch int_fmtio locale md5sha popen regex rpc \
 	setjmp sigsetjmp stdlib string sys time
 .if (${MACHINE_ARCH} != "vax" && ${MACHINE_ARCH} != "m68000")
diff --git a/regress/lib/libc/convfp/Makefile b/regress/lib/libc/convfp/Makefile
new file mode 100644
index 000000000000..e890d97763fb
--- /dev/null
+++ b/regress/lib/libc/convfp/Makefile
@@ -0,0 +1,10 @@
+#	$NetBSD: Makefile,v 1.1 2003/05/03 19:33:52 martin Exp $
+
+NOMAN=		# defined
+
+PROG=		convfp
+
+regress: ${PROG}
+	@./${PROG}
+
+.include <bsd.prog.mk>
diff --git a/regress/lib/libc/convfp/convfp.c b/regress/lib/libc/convfp/convfp.c
new file mode 100644
index 000000000000..4b2a7fa36a16
--- /dev/null
+++ b/regress/lib/libc/convfp/convfp.c
@@ -0,0 +1,78 @@
+/*	$NetBSD: convfp.c,v 1.1 2003/05/03 19:33:52 martin Exp $	*/
+
+/*-
+ * Copyright (c) 2003 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <limits.h>
+#include <stdio.h>
+
+/*
+ * This value is representable as an unsigned int, but not as an int.
+ * According to ISO C it must survive the convsion back from a double
+ * to an unsigned int (everything > -1 and < UINT_MAX+1 has to)
+ */ 
+#define	UINT_TESTVALUE	(INT_MAX+42U)
+
+/* The same for unsigned long */
+#define ULONG_TESTVALUE	(LONG_MAX+42UL)
+
+int
+main()
+{
+	unsigned long ul;
+	double d;
+	unsigned int ui;
+
+	/* unsigned int test */
+	d = UINT_TESTVALUE;
+	ui = (unsigned int)d;
+
+	if (ui != UINT_TESTVALUE) {
+		printf("FAILED: unsigned int %u (0x%x) != %u (0x%x)\n",
+		    ui, ui, UINT_TESTVALUE, UINT_TESTVALUE);
+		exit(1);
+	}
+
+	d = ULONG_TESTVALUE;
+	ul = (unsigned long)d;
+
+	if (ul != ULONG_TESTVALUE) {
+		printf("FAILED: unsigned long %lu (0x%lx) != %lu (0x%lu)\n",
+		    ul, ul, ULONG_TESTVALUE, ULONG_TESTVALUE);
+		exit(1);
+	}
+
+	printf("PASSED\n");
+
+	exit(0);
+}