diff --git a/bluej/package/winlaunch/gfmanifest.xml b/bluej/package/winlaunch/gfmanifest.xml
index 3842f9a64..7d7f8f192 100644
--- a/bluej/package/winlaunch/gfmanifest.xml
+++ b/bluej/package/winlaunch/gfmanifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- Note: the following line is matched by a regex in the build file -->
-  <assemblyIdentity version="3.8.2.0"
+  <assemblyIdentity version="3.9.0.0"
      processorArchitecture="X86"
      name="Greenfoot"
      type="win32"/> 
diff --git a/bluej/package/winlaunch/greenfoot-version.rc b/bluej/package/winlaunch/greenfoot-version.rc
index 6898f6891..c1b31b5c4 100644
--- a/bluej/package/winlaunch/greenfoot-version.rc
+++ b/bluej/package/winlaunch/greenfoot-version.rc
@@ -1,5 +1,5 @@
-FILEVERSION 3,8,2,0
-PRODUCTVERSION 3,8,2,0
+FILEVERSION 3,9,0,0
+PRODUCTVERSION 3,9,0,0
 BEGIN
 	BLOCK "StringFileInfo"
 	BEGIN
@@ -7,11 +7,11 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "BlueJ group"
 			VALUE "FileDescription", "Greenfoot Launcher"
-			VALUE "FileVersion", "3.8.2"
+			VALUE "FileVersion", "3.9.0"
 			VALUE "InternalName", "greenfoot"
 			VALUE "OriginalFilename", "greenfoot.exe"
 			VALUE "ProductName", "Greenfoot"
-			VALUE "ProductVersion", "3.8.2"
+			VALUE "ProductVersion", "3.9.0"
 		END
 	END
 END
diff --git a/bluej/package/winsetup/greenfoot.wxs b/bluej/package/winsetup/greenfoot.wxs
index 70970367b..62d22ebbd 100644
--- a/bluej/package/winsetup/greenfoot.wxs
+++ b/bluej/package/winsetup/greenfoot.wxs
@@ -5,7 +5,7 @@
      If you get a build failure here with a message about ${greenfoot-3.1.0} or similar not being a legal
       guid value, then it is because you failed to make a new GUID for this version: see the
       update-version-number task in ant for details on what to do. -->
-<Product Version='3.8.2' Id='ec9ae584-2781-425a-bedc-d0a58b6a5a5f'
+<Product Version='3.9.0' Id='8e4a1bf9-8dd3-4b56-b8cf-8e1efb4f52e6'
     Name='Greenfoot' UpgradeCode='3ec7b829-9e53-4132-b2bf-fb7d4c08aebc'
     Language='1033' Codepage='1252' Manufacturer='Greenfoot Team'>
     
@@ -23,7 +23,7 @@
     <Property Id="ALLUSERS" Secure="yes" />
     
     <Property Id="SOFTWARE" Value="Greenfoot"/>
-    <Property Id="SOFTWAREVERSION" Value="3.8.2"/>
+    <Property Id="SOFTWAREVERSION" Value="3.9.0"/>
     <Property Id="SOFTWAREPROJECTEXT" Value="greenfoot"/>
     <Property Id="SOFTWAREARCHIVEEXT" Value="gfar"/>
     <!-- Define all the necessary GUIDs here, to make sure they are different from BlueJ -->
diff --git a/boot/src/main/java/bluej/Boot.java b/boot/src/main/java/bluej/Boot.java
index e9aeac097..3dac3bd95 100644
--- a/boot/src/main/java/bluej/Boot.java
+++ b/boot/src/main/java/bluej/Boot.java
@@ -60,7 +60,7 @@ public class Boot
     // version.properties file and then the :boot:updateVersionNumber task should be
     // executed to change them here and elsewhere where needed.
     public static final String BLUEJ_VERSION = "5.4.0";
-    public static final String GREENFOOT_VERSION = "3.8.2";
+    public static final String GREENFOOT_VERSION = "3.9.0";
     public static final String GREENFOOT_API_VERSION = "3.1.0";
 
     public static final String BLUEJ_VERSION_TITLE = "BlueJ " + BLUEJ_VERSION;
diff --git a/greenfoot/doc/Greenfoot-README.txt b/greenfoot/doc/Greenfoot-README.txt
index 6f4f7f0d5..82454dec2 100644
--- a/greenfoot/doc/Greenfoot-README.txt
+++ b/greenfoot/doc/Greenfoot-README.txt
@@ -1,4 +1,4 @@
-Greenfoot version: 3.8.2
+Greenfoot version: 3.9.0
 
 Information about Greenfoot
 -----------------------
diff --git a/version.properties b/version.properties
index 2e938c000..f4d3d3853 100644
--- a/version.properties
+++ b/version.properties
@@ -8,10 +8,10 @@ bluej_suffix=
 bluej_rcnumber=3
 
 greenfoot_major=3
-greenfoot_minor=8
-greenfoot_release=2
+greenfoot_minor=9
+greenfoot_release=0
 greenfoot_suffix=
-greenfoot_rcnumber=2
+greenfoot_rcnumber=1
 
 # Change when API has changed in a way that is likely to break some scenarios. 
 # A warning will be shown to the user - update the greenfoot-labels file to
@@ -70,3 +70,4 @@ greenfoot-3.7.1=54bbe388-bd06-4007-8da6-2da5dbdf2174
 greenfoot-3.8.0=41ad39a1-7328-454a-847b-814b0d008df0
 greenfoot-3.8.1=e9f90c70-f233-4193-b697-6830fc31fcbd
 greenfoot-3.8.2=ec9ae584-2781-425a-bedc-d0a58b6a5a5f
+greenfoot-3.9.0=8e4a1bf9-8dd3-4b56-b8cf-8e1efb4f52e6