diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ae6dcc8ff..cc2926b2d 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-14  Philip Munts  <phil@munts.net>
+
+	* libc/time/asctime_r.c (asctime_r): Replace call to sprintf with call
+	to siprintf.
+	* libc/time/strftime.c: Define snprintf to sniprintf in multibyte case.
+	* libc/time/tzset_r.c: Define sscanf to siscanf.
+
 2011-06-14  Joseph Myers  <joseph@codesourcery.com>
 
 	* configure.host: Don't handle ep9312, strongarm, xscale and thumb
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index 2c02667e6..e8abff1c0 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -18,10 +18,10 @@ _DEFUN (asctime_r, (tim_p, result),
 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
   };
 
-  sprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
-	   day_name[tim_p->tm_wday], 
-	   mon_name[tim_p->tm_mon],
-	   tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
-	   tim_p->tm_sec, 1900 + tim_p->tm_year);
+  siprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n",
+	    day_name[tim_p->tm_wday], 
+	    mon_name[tim_p->tm_mon],
+	    tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min,
+	    tim_p->tm_sec, 1900 + tim_p->tm_year);
   return result;
 }
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 3ab63da1c..f4704b62d 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -285,6 +285,7 @@ the "C" locale settings.
 #  define CQ(a)		a		/* character constant qualifier */
 #  define SFLG				/* %s flag (null for normal char) */
 #  define _ctloc(x) (ctloclen = strlen (ctloc = _CurrentTimeLocale->x), ctloc)
+#  define snprintf	sniprintf	/* avoid to pull in FP functions. */
 #  define TOLOWER(c)	tolower((int)(unsigned char)(c))
 #  define STRTOUL(c,p,b) strtoul((c),(p),(b))
 #  define STRCPY(a,b)	strcpy((a),(b))
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 5a5a9599b..2c5b72341 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -7,6 +7,8 @@
 #include <sys/time.h>
 #include "local.h"
 
+#define sscanf siscanf	/* avoid to pull in FP functions. */
+
 static char __tzname_std[11];
 static char __tzname_dst[11];
 static char *prev_tzenv = NULL;