diff --git a/ChangeLog b/ChangeLog
index e4a99ca3d..e018c30b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-28  Niels Grewe <niels.grewe@halbordnung.de>
+
+	* Source/NSDateFormatter.m: Properly reinstall the user provided
+	date format when we need to recreate the icu-based date formatter.
+
 2015-04-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSThread.m: If an exception occurs while performing a
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index a0c4c6fe6..a64c220d4 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -986,7 +986,11 @@ static NSDateFormatterBehavior _defaultBehavior = 0;
                           &err);
   if (U_FAILURE(err))
     internal->_formatter = NULL;
-  
+  if (nil != self->_dateFormat)
+    {
+      // Set the date format to the user provide one
+      [self setDateFormat: _dateFormat];
+    }
   NSZoneFree ([self zone], tzID);
 #else
   return;