diff --git a/ChangeLog b/ChangeLog
index f0c103ab60..5852ac69f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-04  Joseph S. Myers  <joseph@codesourcery.com>
+
+	* soft-fp/soft-fp.h: Include <stdlib.h>.
+
+	* soft-fp/floatdisf.c (__floatdisf): Return float.
+
 2005-12-05  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h
diff --git a/soft-fp/floatdisf.c b/soft-fp/floatdisf.c
index c7933a85ff..d2a2af0947 100644
--- a/soft-fp/floatdisf.c
+++ b/soft-fp/floatdisf.c
@@ -23,7 +23,7 @@
 #include "soft-fp.h"
 #include "single.h"
 
-double __floatdisf(DItype i)
+float __floatdisf(DItype i)
 {
   FP_DECL_EX;
   FP_DECL_S(A);
diff --git a/soft-fp/soft-fp.h b/soft-fp/soft-fp.h
index 18779f88d8..2dc66c1ba3 100644
--- a/soft-fp/soft-fp.h
+++ b/soft-fp/soft-fp.h
@@ -175,4 +175,6 @@ typedef USItype UHWtype;
 #include <stdlib/longlong.h>
 #endif
 
+#include <stdlib.h>
+
 #endif