Fixed ICE-5209: fixed version to 3.5.0

61 files changed, 295 insertions, 295 deletions

diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index 1e911ffad86..aa315a631e3 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -59,7 +59,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="${instance-name}" entry="IceStormService,35b:createIceStorm">
+      <service name="${instance-name}" entry="IceStormService,35:createIceStorm">
 
         <dbenv name="${service}"/>
 
@@ -111,7 +111,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/demo/Ice/MFC/client/HelloClient.rc b/cpp/demo/Ice/MFC/client/HelloClient.rc
index 36df50eb3a5..342cf773bf9 100755
--- a/cpp/demo/Ice/MFC/client/HelloClient.rc
+++ b/cpp/demo/Ice/MFC/client/HelloClient.rc
@@ -101,8 +101,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -119,12 +119,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc."
             VALUE "FileDescription", "Ice Hello Client"
-            VALUE "FileVersion", "3.5b"
+            VALUE "FileVersion", "3.5.0"
             VALUE "InternalName", "HelloClient.exe"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved."
             VALUE "OriginalFilename", "HelloClient.exe"
             VALUE "ProductName", "Ice"
-            VALUE "ProductVersion", "3.5b"
+            VALUE "ProductVersion", "3.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/MFC/server/HelloServer.rc b/cpp/demo/Ice/MFC/server/HelloServer.rc
index f9577056c10..9421a3611f4 100644
--- a/cpp/demo/Ice/MFC/server/HelloServer.rc
+++ b/cpp/demo/Ice/MFC/server/HelloServer.rc
@@ -92,8 +92,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -110,12 +110,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Hello Server\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "HelloServer.exe\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "HelloServer.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
index 0a1a82c2011..8c731296dc1 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.hello.vcxproj
@@ -74,10 +74,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin35bd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin35bd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin35b</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin35b</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">helloplugin35d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">helloplugin35d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">helloplugin35</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">helloplugin35</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -103,13 +103,13 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>helloplugin35bd.dll</OutputFile>
+      <OutputFile>helloplugin35d.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>helloplugin35bd.lib</ImportLibrary>
+      <ImportLibrary>helloplugin35d.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -141,13 +141,13 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>helloplugin35bd.dll</OutputFile>
+      <OutputFile>helloplugin35d.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>helloplugin35bd.lib</ImportLibrary>
+      <ImportLibrary>helloplugin35d.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -175,12 +175,12 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>helloplugin35b.dll</OutputFile>
+      <OutputFile>helloplugin35.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>helloplugin35b.lib</ImportLibrary>
+      <ImportLibrary>helloplugin35.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -212,12 +212,12 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>helloplugin35b.dll</OutputFile>
+      <OutputFile>helloplugin35.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>helloplugin35b.lib</ImportLibrary>
+      <ImportLibrary>helloplugin35.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
diff --git a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
index 77c9b254f89..2bb1aa6bbf3 100644
--- a/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
+++ b/cpp/demo/Ice/plugin/Ice.plugin.logger.vcxproj
@@ -74,10 +74,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\$(PlatformName)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin35bd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin35bd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin35b</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin35b</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">loggerplugin35d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">loggerplugin35d</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">loggerplugin35</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">loggerplugin35</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -103,13 +103,13 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>loggerplugin35bd.dll</OutputFile>
+      <OutputFile>loggerplugin35d.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>loggerplugin35bd.lib</ImportLibrary>
+      <ImportLibrary>loggerplugin35d.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -141,13 +141,13 @@
     <Link>
       <AdditionalOptions>/FIXED:NO %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Iced.lib;IceUtild.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>loggerplugin35bd.dll</OutputFile>
+      <OutputFile>loggerplugin35d.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>loggerplugin35bd.lib</ImportLibrary>
+      <ImportLibrary>loggerplugin35d.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -175,12 +175,12 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>loggerplugin35b.dll</OutputFile>
+      <OutputFile>loggerplugin35.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>loggerplugin35b.lib</ImportLibrary>
+      <ImportLibrary>loggerplugin35.lib</ImportLibrary>
       <TargetMachine>MachineX86</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
@@ -212,12 +212,12 @@
     <Link>
       <AdditionalOptions>/FIXED:NO /IGNORE:4089 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>Ice.lib;IceUtil.lib;setargv.obj;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>loggerplugin35b.dll</OutputFile>
+      <OutputFile>loggerplugin35.dll</OutputFile>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
-      <ImportLibrary>loggerplugin35b.lib</ImportLibrary>
+      <ImportLibrary>loggerplugin35.lib</ImportLibrary>
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
diff --git a/cpp/demo/IcePatch2/MFC/PatchClient.rc b/cpp/demo/IcePatch2/MFC/PatchClient.rc
index fd6238e3f11..3b2b8af5c43 100644
--- a/cpp/demo/IcePatch2/MFC/PatchClient.rc
+++ b/cpp/demo/IcePatch2/MFC/PatchClient.rc
@@ -118,8 +118,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -136,12 +136,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Patch Client\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "PatchClient.exe\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "PatchClient.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 1ef67c260be..22733024a7b 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -11,7 +11,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998
 # The IceStorm service. The service is configured using a separate
 # configuration file (see config.service).
 #
-IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 845b3d42090..b02967a9479 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -h localhost -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py
index d1e67957eca..8c7d3790149 100755
--- a/cpp/demo/IceStorm/counter/expect.py
+++ b/cpp/demo/IceStorm/counter/expect.py
@@ -27,7 +27,7 @@ Util.cleanDbDir("db")
 print("ok")
 
 if Util.defaultHost:
-    args = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.service %s"' \
+    args = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.service %s"' \
         % Util.defaultHost
 else:
     args = ''
diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml
index b945a6a57c1..28aa8e66e6b 100644
--- a/cpp/demo/IceStorm/replicated/application.xml
+++ b/cpp/demo/IceStorm/replicated/application.xml
@@ -32,7 +32,7 @@
            <properties refid="mx"/>
          </properties>
       
-         <service name="IceStorm" entry="IceStormService,35b:createIceStorm">
+         <service name="IceStorm" entry="IceStormService,35:createIceStorm">
 
            <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1
index 66251b6516d..f8c239d5009 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib1
+++ b/cpp/demo/IceStorm/replicated2/config.ib1
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s1
+IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s1
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2
index 8bb5752441a..74f4d9c0eca 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib2
+++ b/cpp/demo/IceStorm/replicated2/config.ib2
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s2
+IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s2
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3
index b693b48b09d..5925f8f0634 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib3
+++ b/cpp/demo/IceStorm/replicated2/config.ib3
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,35b:createIceStorm --Ice.Config=config.s3
+IceBox.Service.IceStorm=IceStormService,35:createIceStorm --Ice.Config=config.s3
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py
index 80812612351..0498a8da1cb 100755
--- a/cpp/demo/IceStorm/replicated2/expect.py
+++ b/cpp/demo/IceStorm/replicated2/expect.py
@@ -30,11 +30,11 @@ Util.cleanDbDir("db3")
 print("ok")
 
 if Util.defaultHost:
-    a1 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s1 %s"' \
+    a1 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s1 %s"' \
         % Util.defaultHost
-    a2 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s2 %s"' \
+    a2 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s2 %s"' \
         % Util.defaultHost
-    a3 = ' --IceBox.Service.IceStorm="IceStormService,35b:createIceStorm --Ice.Config=config.s3 %s"' \
+    a3 = ' --IceBox.Service.IceStorm="IceStormService,35:createIceStorm --Ice.Config=config.s3 %s"' \
         % Util.defaultHost
 else:
     a1 = ''
diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf
index 782f3c227d8..f9b7c17750f 100644
--- a/cpp/doc/swish/swish.conf
+++ b/cpp/doc/swish/swish.conf
@@ -1,6 +1,6 @@
 Replacerules remove /var/www/html/
-IndexDir /var/www/html/doc/Ice-3.5b/reference
-IndexDir /var/www/html/doc/Ice-3.5b/manual
+IndexDir /var/www/html/doc/Ice-3.5.0/reference
+IndexDir /var/www/html/doc/Ice-3.5.0/manual
 IndexOnly .html
 FileRules filename is _sindex\.html
 DefaultContents HTML*
diff --git a/cpp/doc/swish/swishcgi.conf b/cpp/doc/swish/swishcgi.conf
index f9506cf916f..654e2bd60a0 100644
--- a/cpp/doc/swish/swishcgi.conf
+++ b/cpp/doc/swish/swishcgi.conf
@@ -1,6 +1,6 @@
 use lib '/var/www/html/doc/swishdir';
 
-my $ice_version = '3.5b';
+my $ice_version = '3.5.0';
 my $suffix = '-IceTouch';
 
 my $referer = $ENV{HTTP_REFERER} ? $ENV{HTTP_REFERER} : '';
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index 19beee25149..0bedb0d53a8 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -199,7 +199,7 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.5b" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30551      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.5.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30500      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
index 99e9983caea..df4dffb9522 100644
--- a/cpp/src/Freeze/Freeze.rc
+++ b/cpp/src/Freeze/Freeze.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "freeze35bd\0"
- #define ORIGINALFILENAME "freeze35bd.dll\0"
+ #define INTERNALNAME "freeze35d\0"
+ #define ORIGINALFILENAME "freeze35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "freeze35b\0"
- #define ORIGINALFILENAME "freeze35b.dll\0"
+ #define INTERNALNAME "freeze35\0"
+ #define ORIGINALFILENAME "freeze35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Freeze DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
index e597f8d07ce..76cde53289b 100644
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ b/cpp/src/FreezeScript/DumpDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Dump Database\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "dumpdb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "dumpdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
index 5041aab19d7..455b287257e 100644
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ b/cpp/src/FreezeScript/TransformDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Transform Database\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "transformdb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "transformdb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index 521de9f9a63..46c7607e7f7 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 Router\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "glacier2router\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "glacier2router.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Glacier2Lib/Glacier2.rc b/cpp/src/Glacier2Lib/Glacier2.rc
index 8f5bdb8fa7f..d4a318774c2 100644
--- a/cpp/src/Glacier2Lib/Glacier2.rc
+++ b/cpp/src/Glacier2Lib/Glacier2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "glacier235bd\0"
- #define ORIGINALFILENAME "glacier235bd.dll\0"
+ #define INTERNALNAME "glacier235d\0"
+ #define ORIGINALFILENAME "glacier235d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "glacier235b\0"
- #define ORIGINALFILENAME "glacier235b.dll\0"
+ #define INTERNALNAME "glacier235\0"
+ #define ORIGINALFILENAME "glacier235.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Glacier2 DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index 39814a1672c..c449365cef7 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -2,17 +2,17 @@
 #include "EventLoggerMsg.rc"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "ice35bd\0"
- #define ORIGINALFILENAME "ice35bd.dll\0"
+ #define INTERNALNAME "ice35d\0"
+ #define ORIGINALFILENAME "ice35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "ice35b\0"
- #define ORIGINALFILENAME "ice35b.dll\0"
+ #define INTERNALNAME "ice35\0"
+ #define ORIGINALFILENAME "ice35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Core DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index ba5e4c8f54a..e28c3b1f728 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icebox35bd\0"
- #define ORIGINALFILENAME "icebox35bd.dll\0"
+ #define INTERNALNAME "icebox35d\0"
+ #define ORIGINALFILENAME "icebox35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icebox35b\0"
- #define ORIGINALFILENAME "icebox35b.dll\0"
+ #define INTERNALNAME "icebox35\0"
+ #define ORIGINALFILENAME "icebox35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index 7f8f5072183..43ba1264900 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox Admin\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "iceboxadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "iceboxadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index 2f1d99949f3..7d0156cbb54 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceBox\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceDB/IceDB.rc b/cpp/src/IceDB/IceDB.rc
index 5fedd02b78e..5e6f924df76 100644
--- a/cpp/src/IceDB/IceDB.rc
+++ b/cpp/src/IceDB/IceDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icedb35bd\0"
- #define ORIGINALFILENAME "icedb35bd.dll\0"
+ #define INTERNALNAME "icedb35d\0"
+ #define ORIGINALFILENAME "icedb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icedb35b\0"
- #define ORIGINALFILENAME "icedb35b.dll\0"
+ #define INTERNALNAME "icedb35\0"
+ #define ORIGINALFILENAME "icedb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceDB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
index 6476e1f0b8c..0b6691aac18 100644
--- a/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
+++ b/cpp/src/IceGrid/FreezeDB/IceGridFreezeDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb35bd\0"
- #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
+ #define INTERNALNAME "icestormfreezedb35d\0"
+ #define ORIGINALFILENAME "icestormfreezedb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icegridfreezedb35b\0"
- #define ORIGINALFILENAME "icegridfreezedb35b.dll\0"
+ #define INTERNALNAME "icegridfreezedb35\0"
+ #define ORIGINALFILENAME "icegridfreezedb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Freeze DB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index 45ea6ed1834..78c2eea6e4c 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Admin\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icegridadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index 9e4a204750f..79c15ed7f15 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Node\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icegridnode\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridnode.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 6b88f7bfe5c..17b4d93b348 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Registry\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icegridregistry\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icegridregistry.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
index 7647aceba86..8c50c41ae4d 100644
--- a/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
+++ b/cpp/src/IceGrid/SqlDB/IceGridSqlDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegridsqldb35bd\0"
- #define ORIGINALFILENAME "icegridsqldb35bd.dll\0"
+ #define INTERNALNAME "icegridsqldb35d\0"
+ #define ORIGINALFILENAME "icegridsqldb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icegridsqldb35b\0"
- #define ORIGINALFILENAME "icegridsqldb35b.dll\0"
+ #define INTERNALNAME "icegridsqldb35\0"
+ #define ORIGINALFILENAME "icegridsqldb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid Sql DB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index b38e754d1bd..9642e516849 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icegrid35bd\0"
- #define ORIGINALFILENAME "icegrid35bd.dll\0"
+ #define INTERNALNAME "icegrid35d\0"
+ #define ORIGINALFILENAME "icegrid35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icegrid35b\0"
- #define ORIGINALFILENAME "icegrid35b.dll\0"
+ #define INTERNALNAME "icegrid35\0"
+ #define ORIGINALFILENAME "icegrid35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceGrid DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index 02f224882cf..ec1f16faa2d 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Calc\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icepatch2calc\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2calc.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index 039a9559096..ce56ff812b4 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Client\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icepatch2client\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2client.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index 18bdcfe7545..28498dd17a1 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 Server\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icepatch2server\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icepatch2server.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IcePatch2Lib/IcePatch2.rc b/cpp/src/IcePatch2Lib/IcePatch2.rc
index 6902d496285..9954ca81f35 100644
--- a/cpp/src/IcePatch2Lib/IcePatch2.rc
+++ b/cpp/src/IcePatch2Lib/IcePatch2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icepatch235bd\0"
- #define ORIGINALFILENAME "icepatch235bd.dll\0"
+ #define INTERNALNAME "icepatch235d\0"
+ #define ORIGINALFILENAME "icepatch235d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icepatch235b\0"
- #define ORIGINALFILENAME "icepatch235b.dll\0"
+ #define INTERNALNAME "icepatch235\0"
+ #define ORIGINALFILENAME "icepatch235.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IcePatch2 DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 2af3a7096ef..532c1896953 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icessl35bd\0"
- #define ORIGINALFILENAME "icessl35bd.dll\0"
+ #define INTERNALNAME "icessl35d\0"
+ #define ORIGINALFILENAME "icessl35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icessl35b\0"
- #define ORIGINALFILENAME "icessl35b.dll\0"
+ #define INTERNALNAME "icessl35\0"
+ #define ORIGINALFILENAME "icessl35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceSSL DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
index 13170fa520d..ab8a00d85c1 100644
--- a/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
+++ b/cpp/src/IceStorm/FreezeDB/IceStormFreezeDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormfreezedb35bd\0"
- #define ORIGINALFILENAME "icestormfreezedb35bd.dll\0"
+ #define INTERNALNAME "icestormfreezedb35d\0"
+ #define ORIGINALFILENAME "icestormfreezedb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormfreezedb35b\0"
- #define ORIGINALFILENAME "icestormfreezedb35b.dll\0"
+ #define INTERNALNAME "icestormfreezedb35\0"
+ #define ORIGINALFILENAME "icestormfreezedb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Freeze DB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc
index c43a5e5a2b0..9741456abd8 100644
--- a/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc
+++ b/cpp/src/IceStorm/FreezeDB/IceStormMigrate.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Migrate\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icestormmigrate\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icestormmigrate.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index 635b3c41707..96f866c4451 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Admin\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "icestormadmin\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "icestormadmin.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormDB.rc b/cpp/src/IceStorm/IceStormDB.rc
index e835ba7f703..3edbf984350 100644
--- a/cpp/src/IceStorm/IceStormDB.rc
+++ b/cpp/src/IceStorm/IceStormDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormdb35bd\0"
- #define ORIGINALFILENAME "icestormdb35bd.dll\0"
+ #define INTERNALNAME "icestormdb35d\0"
+ #define ORIGINALFILENAME "icestormdb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormdb35b\0"
- #define ORIGINALFILENAME "icestormdb35b.dll\0"
+ #define INTERNALNAME "icestormdb35\0"
+ #define ORIGINALFILENAME "icestormdb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm DB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index 2f32972a9e4..146be72f87e 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormservice35bd\0"
- #define ORIGINALFILENAME "icestormservice35bd.dll\0"
+ #define INTERNALNAME "icestormservice35d\0"
+ #define ORIGINALFILENAME "icestormservice35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormservice35b\0"
- #define ORIGINALFILENAME "icestormservice35b.dll\0"
+ #define INTERNALNAME "icestormservice35\0"
+ #define ORIGINALFILENAME "icestormservice35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Service DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
index 5fbdaa99d56..f0022dcdbfc 100644
--- a/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
+++ b/cpp/src/IceStorm/SqlDB/IceStormSqlDB.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestormsqldb35bd\0"
- #define ORIGINALFILENAME "icestormsqldb35bd.dll\0"
+ #define INTERNALNAME "icestormsqldb35d\0"
+ #define ORIGINALFILENAME "icestormsqldb35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestormsqldb35b\0"
- #define ORIGINALFILENAME "icestormsqldb35b.dll\0"
+ #define INTERNALNAME "icestormsqldb35\0"
+ #define ORIGINALFILENAME "icestormsqldb35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm Sql DB DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceStormLib/IceStorm.rc b/cpp/src/IceStormLib/IceStorm.rc
index 4f0d6706670..ca53d5425cd 100644
--- a/cpp/src/IceStormLib/IceStorm.rc
+++ b/cpp/src/IceStormLib/IceStorm.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icestorm35bd\0"
- #define ORIGINALFILENAME "icestorm35bd.dll\0"
+ #define INTERNALNAME "icestorm35d\0"
+ #define ORIGINALFILENAME "icestorm35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icestorm35b\0"
- #define ORIGINALFILENAME "icestorm35b.dll\0"
+ #define INTERNALNAME "icestorm35\0"
+ #define ORIGINALFILENAME "icestorm35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceStorm DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index 82128eb52a0..81781f9943c 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil35bd\0"
- #define ORIGINALFILENAME "iceutil35bd.dll\0"
+ #define INTERNALNAME "iceutil35d\0"
+ #define ORIGINALFILENAME "iceutil35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil35b\0"
- #define ORIGINALFILENAME "iceutil35b.dll\0"
+ #define INTERNALNAME "iceutil35\0"
+ #define ORIGINALFILENAME "iceutil35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice Utilities DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index 822b15d0d64..bcab2daaa35 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "icexml35bd\0"
- #define ORIGINALFILENAME "icexml35bd.dll\0"
+ #define INTERNALNAME "icexml35d\0"
+ #define ORIGINALFILENAME "icexml35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "icexml35b\0"
- #define ORIGINALFILENAME "icexml35b.dll\0"
+ #define INTERNALNAME "icexml35\0"
+ #define ORIGINALFILENAME "icexml35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "IceXML DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc
index 82b48b99ae8..2a67ad1bea8 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/Slice/Slice.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "slice35bd\0"
- #define ORIGINALFILENAME "slice35bd.dll\0"
+ #define INTERNALNAME "slice35d\0"
+ #define ORIGINALFILENAME "slice35d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "slice35b\0"
- #define ORIGINALFILENAME "slice35b.dll\0"
+ #define INTERNALNAME "slice35\0"
+ #define ORIGINALFILENAME "slice35.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice Utilities DLL\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index 398a6b2830c..55320a098db 100755
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -118,7 +118,7 @@ if sys.argv[script] == "import":
         checkLocations = [".", 
                           os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")),
                           os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "..", "lib")),
-                          "/usr/share/Ice-3.5b"]
+                          "/usr/share/Ice-3.5.0"]
         for bindir in checkLocations:
             bindir = os.path.normpath(bindir)
             if os.path.exists(os.path.join(bindir, "ImportKey.class")):
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index c5304d49239..c450fcc726b 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Service Installer\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "iceserviceinstall\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "iceserviceinstall.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2confluence/Slice2Confluence.rc b/cpp/src/slice2confluence/Slice2Confluence.rc
index 8168933a1cf..943410fe4e2 100644
--- a/cpp/src/slice2confluence/Slice2Confluence.rc
+++ b/cpp/src/slice2confluence/Slice2Confluence.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Confluence Markup Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2confluence\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2confluence.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index cfad22aa211..3d8858e829c 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To C++ Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2cpp\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2cpp.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index 5418a915271..33666a315f0 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To C# Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2cs\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2cs.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
index a876100df18..7013e171069 100644
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ b/cpp/src/slice2freeze/Slice2Freeze.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Freeze Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2freeze\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2freeze.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
index 3962e343afe..6323669385b 100644
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Freeze for Java Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2freezej\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2freezej.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index 855119643a7..d2e2322a853 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To HTML Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2html\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2html.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 7efbd4f8a3e..e71ccff740b 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Java Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2java\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2java.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2php/Slice2PHP.rc b/cpp/src/slice2php/Slice2PHP.rc
index 1311d08a03e..fbad1236c91 100644
--- a/cpp/src/slice2php/Slice2PHP.rc
+++ b/cpp/src/slice2php/Slice2PHP.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index 1311d08a03e..fbad1236c91 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Python Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2py\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2py.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
index cd6b452c534..562312f5c06 100644
--- a/cpp/src/slice2rb/Slice2Rb.rc
+++ b/cpp/src/slice2rb/Slice2Rb.rc
@@ -1,8 +1,8 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,51,0
- PRODUCTVERSION 3,5,51,0
+ FILEVERSION 3,5,0,0
+ PRODUCTVERSION 3,5,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -19,12 +19,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Slice To Ruby Translator\0"
-            VALUE "FileVersion", "3.5b\0"
+            VALUE "FileVersion", "3.5.0\0"
             VALUE "InternalName", "slice2rb\0"
             VALUE "LegalCopyright", "Copyright (c) 2003-2013 ZeroC, Inc.  All rights reserved.\0"
             VALUE "OriginalFilename", "slice2rb.exe\0"
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.5b\0"
+            VALUE "ProductVersion", "3.5.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index 57511852aaa..fd72833370a 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -28,7 +28,7 @@
       <parameter name="publish-replica-group"/>
       <parameter name="topic-manager-replica-group"/>
 
-      <service name="${instance-name}${node-id}" entry="IceStormService,35b:createIceStorm">
+      <service name="${instance-name}${node-id}" entry="IceStormService,35:createIceStorm">
 
         <dbenv name="${service}"/>