diff --git a/ChangeLog b/ChangeLog
index 6425afd53..c0e43fb8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-21  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Version: set to 1.15.4 for new release on unstable branch.
+	* Documentation/ReleaseNotes.gsdoc: Document the 1.15.4 release
+	Make new release on unstable branch to that it's keeping up with
+	the bugfixes in the stable branch.
+
 2008-11-20  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSConnection.h: New ivars
diff --git a/Documentation/ReleaseNotes.gsdoc b/Documentation/ReleaseNotes.gsdoc
index f69294989..86b9429ab 100644
--- a/Documentation/ReleaseNotes.gsdoc
+++ b/Documentation/ReleaseNotes.gsdoc
@@ -29,7 +29,7 @@ notice and this notice are preserved.
 	migrate to using a newer version of the library.
       </p>
       <section>
-	<heading>Version 1.17.0</heading>
+	<heading>Version 1.15.4</heading>
 	<p> 
           This is an unstable release.
 	</p>
@@ -44,7 +44,10 @@ notice and this notice are preserved.
 	  <term>NSCoder</term>
 	  <desc>New OSX10.5 methods for NSInteger implemented.</desc>
 	  <term>NSConnection</term>
-	  <desc>New OSX10.5 methods for server connections implemented.</desc>
+	  <desc>New OSX10.5 methods for server connections implemented.<br />
+	  A keepalive facility so that daemons can tell (on mswindows)
+	  that all client processes have gone away, and shut themselves down.
+	  </desc>
 	  <term>NSData</term>
 	  <desc>New OSX method stubs.</desc>
 	  <term>NSException</term>
@@ -65,10 +68,16 @@ notice and this notice are preserved.
 	  <desc>Fully support namespace handling and fix bugs.</desc>
 	  <term>NSKeyValueCoding, NSKeyValueObserving</term>
 	  <desc>Made fully functional and MacOS-X compatible.</desc>
+	  <term>Windows 64bit</term>
+	  <desc>Changes so that the library can be built/used for 64bit windows.
+	  </desc>
+	  <term>@synchronize</term>
+	  <desc>Support for new ObjC language feature.
+	  </desc>
 	</deflist>
         <p>The current emphasis of the base library is MacOS-X compatibility,
         and the headers in this release mark many non-MacOS-X methods as being
-        scheduled for removal by the next release (from 1.17.0).<br />
+        scheduled for removal by the next unstable release (from 1.17.0).<br />
         These methods will mostly be moved to the 'additions' library,
         (which can be built stand-alone in conjunction with the Cocoa Foundation
         framework as libgnustep-baseadd on OSX) and their declarations will
diff --git a/Tools/gdomap.c b/Tools/gdomap.c
index 7a316bbf4..4e291bb69 100644
--- a/Tools/gdomap.c
+++ b/Tools/gdomap.c
@@ -22,7 +22,7 @@
    Boston, MA 02111 USA.
    */
 
-/* Ported to mingw 07/12/00 by Björn Giesler <Bjoern.Giesler@gmx.de> */
+/* Ported to mingw 07/12/00 by Bjorn Giesler <Bjoern.Giesler@gmx.de> */
 
 #include "config.h"
 #include "GNUstepBase/GSConfig.h"
diff --git a/Version b/Version
index c5cd26085..42522cb7e 100644
--- a/Version
+++ b/Version
@@ -6,10 +6,10 @@ GCC_VERSION=2.9.5
 
 # The version number of this release.
 MAJOR_VERSION=1
-MINOR_VERSION=17
-SUBMINOR_VERSION=0
+MINOR_VERSION=15
+SUBMINOR_VERSION=4
 # numeric value should match above
-VERSION_NUMBER=117.0
+VERSION_NUMBER=115.4
 GNUSTEP_BASE_VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${SUBMINOR_VERSION}
 VERSION=${GNUSTEP_BASE_VERSION}