diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3dace7e1e..5bd751376 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ We review carefully any contribution that we accept, and these reviews may take
 
 We prefer small contributions as they are easier to review and integrate. If you want to contribute but don't know where to start, consider one of these areas:
 
- * New sample programs (in the [ice-demos](https://github.com/zeroc-ice/ice-demos) repository)
+ * New sample programs (in the [ice-demos](https://github.com/zeroc-ice/ice-demos/tree/3.6) repository)
 
  * Small bug fixes that affect only one or a few source files
 
diff --git a/cpp/IceBox/hello/README.md b/cpp/IceBox/hello/README.md
index 14f724fcb..dc85dd490 100644
--- a/cpp/IceBox/hello/README.md
+++ b/cpp/IceBox/hello/README.md
@@ -17,7 +17,7 @@ as follows:
 
 You can find more details in our online documentation.
 
-https://doc.zeroc.com/display/Ice36/Starting+the+IceBox+Server
+https://doc.zeroc.com/ice/3.6/icebox/starting-the-icebox-server
 
 In the second window, run the client:
 
diff --git a/cpp/README.md b/cpp/README.md
index 3c8d256d7..399d13866 100644
--- a/cpp/README.md
+++ b/cpp/README.md
@@ -139,8 +139,8 @@ and change to the deployment directory:
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
-[2]: https://doc.zeroc.com/display/Doc/Chat+Demo
+[1]: https://doc.zeroc.com/ice/3.6/introduction
+[2]: https://doc.zeroc.com/technical-articles/general-topics/chat-demo
 [3]: https://github.com/zeroc-ice/ice-builder-xcode
-[4]: https://doc.zeroc.com/display/Ice36/Ice+Release+Notes
+[4]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes
 [5]: https://github.com/zeroc-ice/ice-builder-visualstudio
diff --git a/csharp/README.md b/csharp/README.md
index ac0687a55..957fa393b 100644
--- a/csharp/README.md
+++ b/csharp/README.md
@@ -37,7 +37,7 @@ as described in the [release notes][4].
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
-[2]: https://doc.zeroc.com/display/Doc/Chat+Demo
+[1]: https://doc.zeroc.com/ice/3.6/introduction
+[2]: https://doc.zeroc.com/technical-articles/general-topics/chat-demo
 [3]: https://github.com/zeroc-ice/ice-builder-visualstudio
-[4]: https://doc.zeroc.com/display/Ice36/Ice+Release+Notes
+[4]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes
diff --git a/java/README.md b/java/README.md
index 9dc3d7f01..a0d61ae1d 100644
--- a/java/README.md
+++ b/java/README.md
@@ -54,6 +54,6 @@ as described in the [release notes][3].
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
-[2]: https://doc.zeroc.com/display/Doc/Chat+Demo
-[3]: https://doc.zeroc.com/display/Ice36/Ice+Release+Notes
+[1]: https://doc.zeroc.com/ice/3.6/introduction
+[2]: https://doc.zeroc.com/technical-articles/general-topics/chat-demo
+[3]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes
diff --git a/objective-c/README.md b/objective-c/README.md
index 623d13d7b..1bcc7d99c 100644
--- a/objective-c/README.md
+++ b/objective-c/README.md
@@ -46,5 +46,5 @@ To build the Cocoa or iOS examples, open `IceTouch/demos.xcworkspace` in Xcode.
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
+[1]: https://doc.zeroc.com/ice/3.6/introduction
 [2]: https://github.com/zeroc-ice/ice-builder-xcode
diff --git a/python/README.md b/python/README.md
index d786ce359..17be2d751 100644
--- a/python/README.md
+++ b/python/README.md
@@ -22,5 +22,5 @@ Our [documentation][2] describes how to install the Python packages.
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
-[2]: https://doc.zeroc.com/display/Ice36/Using+the+Python+Distribution
+[1]: https://doc.zeroc.com/ice/3.6/introduction
+[2]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes/using-the-python-distribution-for-ice-3-6-5
diff --git a/ruby/README.md b/ruby/README.md
index 1460d59a0..fb58f359e 100644
--- a/ruby/README.md
+++ b/ruby/README.md
@@ -33,5 +33,5 @@ the `-rubygems` option as shown in the example below:
 
     ruby -rubygems Client.rb
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
-[2]: https://doc.zeroc.com/display/Ice36/Using+the+Ruby+Distribution
+[1]: https://doc.zeroc.com/ice/3.6/introduction
+[2]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes/using-the-ruby-distribution-for-ice-3-6-5
diff --git a/visualBasic/README.md b/visualBasic/README.md
index b8a0c86b3..0529c1f81 100644
--- a/visualBasic/README.md
+++ b/visualBasic/README.md
@@ -34,6 +34,6 @@ as described in the [release notes][3].
 
 Refer to the README file in each demo directory for usage instructions.
 
-[1]: https://doc.zeroc.com/display/Ice36/Ice+Manual
+[1]: https://doc.zeroc.com/ice/3.6/introduction
 [2]: https://github.com/zeroc-ice/ice-builder-visualstudio
-[3]: https://doc.zeroc.com/display/Ice36/Ice+Release+Notes
+[3]: https://doc.zeroc.com/rel/ice-releases/ice-3-6/ice-3-6-5-release-notes