12 files changed, 27 insertions, 18 deletions
diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini
index d5848425695..86bc1b3bc77 100755
--- a/cpp/install/common/components/components.ini
+++ b/cpp/install/common/components/components.ini
@@ -10,7 +10,7 @@ ice-java-runtime=java runtime
 ice-java-dev=java dev
 ice-csharp-runtime=dotnet runtime
 ice-dotnet-pdbs=dotnet dev
-ice-dotnet-ssl=dotnet ssl
+ice-dotnet-ssl-runtime=dotnet ssl
 ice-dotnet-ssl-dev=dotnet ssl dev
 ice-csharp-dev=csharp dev
 ice-csharp-demo=csharp demo
@@ -357,17 +357,11 @@ filelist2=berkeleydb.java.dll
 dest2=bin
 
 [berkeley db dev]
-elements=3
+elements=1
 active=1
 source1=%(DB_HOME)s
 filelist1=berkeleydb.dev.dll
 dest1=bin
-source2=%(DB_HOME)s
-filelist2=berkeleydb.dev.lib
-dest2=lib
-source3=%(DB_HOME)s
-filelist3=berkeleydb.dev.headers
-dest3=include
 
 [bzip2 runtime]
 elements=1
@@ -377,17 +371,11 @@ filelist1=bzip2.runtime
 dest1=bin
 
 [bzip2 dev]
-elements=3
+elements=1
 active=1
 source1=%(BZIP2_HOME)s
-filelist1=bzip2.dev.lib
-dest1=lib
-source2=%(BZIP2_HOME)s
-filelist2=bzip2.dev.header
-dest2=include
-source3=%(BZIP2_HOME)s
-filelist3=bzip2.dev.dll
-dest3=bin
+filelist1=bzip2.dev.dll
+dest1=bin
 
 [expat runtime]
 elements=1
diff --git a/cpp/install/common/components/ice.config.files b/cpp/install/common/components/ice.config.files
index 4479613a6b2..883bb1152db 100755
--- a/cpp/install/common/components/ice.config.files
+++ b/cpp/install/common/components/ice.config.files
@@ -1 +1,9 @@
 templates.xml
+convertssl.py
+upgradeicegrid.py
+ca/initca.py
+ca/req.py
+ca/cautil.py
+ca/import.py
+ca/sign.py
+ca/ImportKey.class
diff --git a/cpp/install/common/components/ice.demo.vc60 b/cpp/install/common/components/ice.demo.vc60
index ee65e2b183f..caf8c195a0e 100755
--- a/cpp/install/common/components/ice.demo.vc60
+++ b/cpp/install/common/components/ice.demo.vc60
@@ -288,6 +288,7 @@ IceBox/hello/HelloServiceI.cpp
 IceBox/hello/HelloServiceI.h
 IceBox/hello/README
 IceBox/README
+IceGrid/README
 IceGrid/allocate/allocateC.dsp
 IceGrid/allocate/allocateS.dsp
 IceGrid/allocate/application-multiple.xml
diff --git a/cpp/install/common/components/ice.demo.vc71 b/cpp/install/common/components/ice.demo.vc71
index 4c65d9cf7f4..c1dde224377 100755
--- a/cpp/install/common/components/ice.demo.vc71
+++ b/cpp/install/common/components/ice.demo.vc71
@@ -429,3 +429,4 @@ Freeze/bench/db
 Freeze/library/db
 Freeze/phonebook/db
 IceStorm/clock/db
+IceGrid/README
diff --git a/cpp/install/common/components/ice.demo.vc80 b/cpp/install/common/components/ice.demo.vc80
index 3f8519adb30..ad86debfa3d 100755
--- a/cpp/install/common/components/ice.demo.vc80
+++ b/cpp/install/common/components/ice.demo.vc80
@@ -423,3 +423,4 @@ Freeze/bench/db
 Freeze/library/db
 Freeze/phonebook/db
 IceStorm/clock/db
+IceGrid/README
diff --git a/cpp/install/common/components/ice.demo.vc80_x64 b/cpp/install/common/components/ice.demo.vc80_x64
index fd4f73ba322..a7a38c151a2 100755
--- a/cpp/install/common/components/ice.demo.vc80_x64
+++ b/cpp/install/common/components/ice.demo.vc80_x64
@@ -423,3 +423,4 @@ Freeze/bench/db
 Freeze/library/db
 Freeze/phonebook/db
 IceStorm/clock/db
+IceGrid/README
diff --git a/cpp/install/common/components/ice.java.ant b/cpp/install/common/components/ice.java.ant
index b6fb08efee1..e0e10beebb0 100755
--- a/cpp/install/common/components/ice.java.ant
+++ b/cpp/install/common/components/ice.java.ant
@@ -6,3 +6,4 @@ Slice2JavaTask.class
 SliceDefine.class
 SliceTask$SliceDependency.class
 SliceTask.class
+SliceMeta.class
diff --git a/cpp/install/common/components/ice.python.python b/cpp/install/common/components/ice.python.python
index 439efe11338..7d6735d03b9 100755
--- a/cpp/install/common/components/ice.python.python
+++ b/cpp/install/common/components/ice.python.python
@@ -63,3 +63,8 @@ Ice_ServantLocator_ice.py
 Ice_SliceChecksumDict_ice.py
 Ice_StatsF_ice.py
 Ice_Stats_ice.py
+Glacier2_SSLInfo_ice.py
+IceGrid_FileParser_ice.py
+IceGrid_Registry_ice.py
+IceGrid_Session_ice.py
+IceGrid_UserAccountMapper_ice.py
diff --git a/cpp/install/common/components/icecs.demo.vc71 b/cpp/install/common/components/icecs.demo.vc71
index 9890c54acc1..573ec9cbd91 100644
--- a/cpp/install/common/components/icecs.demo.vc71
+++ b/cpp/install/common/components/icecs.demo.vc71
@@ -167,6 +167,7 @@ IceBox/hello/helloIceBoxSD_11.csproj
 IceBox/hello/HelloServiceI.cs
 IceBox/hello/README
 IceBox/README
+IceGrid/README
 IceGrid/allocate/allocateCD_11.csproj
 IceGrid/allocate/allocateSD_11.csproj
 IceGrid/allocate/application-multiple.xml
diff --git a/cpp/install/common/components/icecs.demo.vc80 b/cpp/install/common/components/icecs.demo.vc80
index c65823678f3..50c9988f02a 100644
--- a/cpp/install/common/components/icecs.demo.vc80
+++ b/cpp/install/common/components/icecs.demo.vc80
@@ -167,6 +167,7 @@ IceBox/hello/helloIceBoxSD.csproj
 IceBox/hello/HelloServiceI.cs
 IceBox/hello/README
 IceBox/README
+IceGrid/README
 IceGrid/allocate/allocateCD.csproj
 IceGrid/allocate/allocateSD.csproj
 IceGrid/allocate/application-multiple.xml
diff --git a/cpp/install/common/components/icej.demo b/cpp/install/common/components/icej.demo
index e31a2f66da2..a1919379426 100755
--- a/cpp/install/common/components/icej.demo
+++ b/cpp/install/common/components/icej.demo
@@ -201,6 +201,7 @@ IceGrid/allocate/HelloI.java
 IceGrid/allocate/README
 IceGrid/allocate/Server.java
 IceGrid/build.xml
+IceGrid/README
 IceGrid/sessionActivation/application.xml
 IceGrid/sessionActivation/build.xml
 IceGrid/sessionActivation/Client.java
diff --git a/cpp/install/vc80/Ice.ism b/cpp/install/vc80/Ice.ism
index 31f2daa344c..ac0ec9c8bfc 100755
--- a/cpp/install/vc80/Ice.ism
+++ b/cpp/install/vc80/Ice.ism
@@ -1613,7 +1613,7 @@
 		<row><td>IceCppRuntime</td><td>&lt;ISProjectFolder&gt;\install\ice\cpp\runtime</td><td>4</td><td/><td/><td>2</td></row>
 		<row><td>IceDoc</td><td>&lt;ISProjectFolder&gt;\install\ice\common\doc</td><td>4</td><td/><td/><td>0</td></row>
 		<row><td>IceDotnetPDBs</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\pdbs</td><td>4</td><td/><td/><td>2</td></row>
-		<row><td>IceDotnetSSL</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl</td><td>4</td><td/><td/><td>2</td></row>
+		<row><td>IceDotnetSSL</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl\runtime</td><td>4</td><td/><td/><td>2</td></row>
 		<row><td>IceDotnetSSLPDB</td><td>&lt;ISProjectFolder&gt;\install\ice\dotnet\ssl\dev</td><td>4</td><td/><td/><td>2</td></row>
 		<row><td>IceJavaDemo</td><td>&lt;ISProjectFolder&gt;\install\ice\java\demo</td><td>4</td><td/><td/><td>2</td></row>
 		<row><td>IceJavaDev</td><td>&lt;ISProjectFolder&gt;\install\ice\java\dev</td><td>4</td><td/><td/><td>2</td></row>