diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 869952b9f..d7d92aa1a 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-26  Corinna Vinschen  <vinschen@redhat.com>
+
+	* libc/stdio/findfp.c (__sinit): Set __sdidinit last.
+
 2012-03-09  Jeff Johnston  <jjohnstn@redhat.com>
 
 	* libc/include/machine/setjmp-dj.h: Modify license to include
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 570fd457e..d81241434 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -192,7 +192,6 @@ _DEFUN(__sinit, (s),
 
   /* make sure we clean up on exit */
   s->__cleanup = _cleanup_r;	/* conservative */
-  s->__sdidinit = 1;
 
   s->__sglue._next = NULL;
 #ifndef _REENT_SMALL
@@ -224,6 +223,8 @@ _DEFUN(__sinit, (s),
      when the underlying fd 2 is write-only.  */
   std (s->_stderr, __SRW | __SNBF, 2, s);
 
+  s->__sdidinit = 1;
+
   __sinit_lock_release ();
 }