diff --git a/Announce.txt b/Announce.txt
index b55c849fc..5bd8dd207 100644
--- a/Announce.txt
+++ b/Announce.txt
@@ -9,7 +9,7 @@
      SSSS     ttt  eeeee llll llll  aaaaa
 
 ===========================================================================
-                Release 3.5.5 for Linux, MacOSX and Windows
+                Release 3.6 for Linux, MacOSX and Windows
 ===========================================================================
 
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the
@@ -21,31 +21,31 @@ all of your favourite Atari 2600 games again!  Stella was originally
 developed for Linux by Bradford W. Mott, however, it has been ported to a
 number of other platforms and is currently maintained by Stephen Anthony.
 
-This is the 3.5.5 release of Stella for Linux, Mac OSX and Windows.  The
+This is the 3.6 release of Stella for Linux, Mac OSX and Windows.  The
 distributions currently available are:
 
   * Binaries for Windows XP/Vista/7 :
-      Stella-3.5.5-win32.exe   (32-bit EXE installer)
-      Stella-3.5.5-x64.exe     (64-bit EXE installer)
-      Stella-3.5.5-windows.zip (32/64 bit versions)
+      Stella-3.6-win32.exe   (32-bit EXE installer)
+      Stella-3.6-x64.exe     (64-bit EXE installer)
+      Stella-3.6-windows.zip (32/64 bit versions)
 
   * Binaries for Windows 98/2000 :
-      Stella-3.5.5_98_2k-windows.zip (32-bit for Windows 98/2000)
+      Stella-3.6_98_2k-windows.zip (32-bit for Windows 98/2000)
 
   * Binary distribution for MacOSX 32-bit & 64-bit :
-      Stella-3.5.5-macosx.dmg (32-bit Universal Binary)
-      Stella-3.5.5_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only)
+      Stella-3.6-macosx.dmg (32-bit Universal Binary)
+      Stella-3.6_intel-macosx.dmg (32/64-bit Intel/OSX 10.6+)
 
   * Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
-      stella_3.5.5-1_i386.deb
-      stella_3.5.5-1_amd64.deb
+      stella_3.6-1_i386.deb
+      stella_3.6-1_amd64.deb
 
   * Binary distribution in 32-bit & 64-bit RPM format :
-      stella-3.5.5-2.i386.rpm
-      stella-3.5.5-2.x86_64.rpm
+      stella-3.6-2.i386.rpm
+      stella-3.6-2.x86_64.rpm
 
   * Source code distribution for all platforms :
-      stella-3.5.5-src.tar.gz
+      stella-3.6-src.tar.gz
 
 PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH
 REQUESTS WILL BE IGNORED!
diff --git a/Readme.txt b/Readme.txt
index 4e717607f..39ffdd221 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -1,4 +1,4 @@
-This is release 3.5.5 of Stella.  Stella is a multi-platform Atari 2600 VCS
+This is release 3.6 of Stella.  Stella is a multi-platform Atari 2600 VCS
 emulator which allows you to play all of your favourite Atari 2600 games
 on your PC.  You'll find the Stella Users Manual in the docs subdirectory.
 If you'd like to verify that you have the latest release of Stella visit
@@ -9,4 +9,4 @@ the Stella Website at:
 Enjoy,
 
 The Stella Team
-February 4, 2012
+March 23, 2012
diff --git a/debian/changelog b/debian/changelog
index acee0d6a4..c9a4639b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+stella (3.6-1) stable; urgency=high
+
+  * Version 3.6 release
+
+ -- Stephen Anthony <stephena@users.sf.net>  Fri, 23 Mar 2012 18:38:25 +0200
+
+
 stella (3.5.5-1) stable; urgency=high
 
   * Version 3.5.5 release
diff --git a/src/unix/stella.SlackBuild b/src/unix/stella.SlackBuild
index ab1984eff..3a972fd17 100644
--- a/src/unix/stella.SlackBuild
+++ b/src/unix/stella.SlackBuild
@@ -13,7 +13,7 @@ die() {
 	exit 1
 }
 
-VERSION=3.5.5
+VERSION=3.6
 ARCH=${ARCH-i486}
 BUILD=1
 
diff --git a/src/unix/stella.spec b/src/unix/stella.spec
index 7f5428f6c..5eaddd3d3 100644
--- a/src/unix/stella.spec
+++ b/src/unix/stella.spec
@@ -1,5 +1,5 @@
 %define name    stella
-%define version 3.5.5
+%define version 3.6
 %define rel     1
 
 %define enable_gl 1
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 %_datadir/icons/large/%{name}.png
 
 %changelog
+* Fri Mar 23 2012 Stephen Anthony <stephena@users.sf.net> 3.6-1
+- Version 3.6 release
+
 * Sat Feb 4 2012 Stephen Anthony <stephena@users.sf.net> 3.5.5-1
 - Version 3.5.5 release
 
diff --git a/src/win32/stella.rc b/src/win32/stella.rc
index 5f6640d9e..adbe012da 100755
--- a/src/win32/stella.rc
+++ b/src/win32/stella.rc
@@ -36,8 +36,8 @@ IDI_ICON                ICON                    "stella.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,5,0
- PRODUCTVERSION 3,5,5,0
+ FILEVERSION 3,6,0,0
+ PRODUCTVERSION 3,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,12 +55,12 @@ BEGIN
             VALUE "Comments", "The multi-platform Atari 2600 emulator.  Stella is released under the GPLv2."
             VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)"
             VALUE "FileDescription", "Stella"
-            VALUE "FileVersion", "3.5.5"
+            VALUE "FileVersion", "3.6"
             VALUE "InternalName", "Stella"
             VALUE "LegalCopyright", "Copyright (C) 1995-2012 The Stella Team"
             VALUE "OriginalFilename", "Stella.exe"
             VALUE "ProductName", "Stella"
-            VALUE "ProductVersion", "3.5.5"
+            VALUE "ProductVersion", "3.6"
         END
     END
     BLOCK "VarFileInfo"