diff --git a/docs/source/build_network.rst b/docs/source/build_network.rst
index 73da19b4146..678f374b69a 100644
--- a/docs/source/build_network.rst
+++ b/docs/source/build_network.rst
@@ -156,7 +156,7 @@ Next, you can bring the network up with one of the following commands:
 
 The above command will compile Golang chaincode images and spin up the corresponding
 containers. Go is the default chaincode language, however there is also support
-for `Node.js <https://fabric-shim.github.io/>`_ and `Java <https://fabric-chaincode-java.github.io/>`_
+for `Node.js <https://fabric-shim.github.io/>`_ and `Java <https://hyperledger.github.io/fabric-chaincode-java/>`_
 chaincode. If you'd like to run through this tutorial with node chaincode, pass
 the following command instead:
 
@@ -171,7 +171,7 @@ the following command instead:
           `documentation <https://fabric-shim.github.io/ChaincodeInterface.html>`_.
 
 .. note:: For more information on the Java shim, please refer to its
-          `documentation <https://fabric-chaincode-java.github.io/org/hyperledger/fabric/shim/Chaincode.html>`_.
+          `documentation <https://hyperledger.github.io/fabric-chaincode-java/master/api/org/hyperledger/fabric/shim/Chaincode.html>`_.
 
 Тo make the sample run with Java chaincode, you have to specify ``-l java`` as follows:
 
diff --git a/docs/source/chaincode4ade.rst b/docs/source/chaincode4ade.rst
index c9d06a55d55..403abd44e75 100644
--- a/docs/source/chaincode4ade.rst
+++ b/docs/source/chaincode4ade.rst
@@ -31,7 +31,7 @@ documentation of the Chaincode Shim API for different languages below:
 
   - `Go <https://godoc.org/github.com/hyperledger/fabric-chaincode-go/shim#Chaincode>`__
   - `node.js <https://fabric-shim.github.io/ChaincodeInterface.html>`__
-  - `Java <https://fabric-chaincode-java.github.io/master/api/org/hyperledger/fabric/shim/Chaincode.html>`_
+  - `Java <https://hyperledger.github.io/fabric-chaincode-java/master/api/org/hyperledger/fabric/shim/Chaincode.html>`_
 
 In each language, the ``Invoke`` method is called by clients to submit transaction
 proposals. This method allows you to use the chaincode to read and write data on
@@ -55,7 +55,7 @@ The other interface in the chaincode "shim" APIs is the ``ChaincodeStubInterface
 
   - `Go <https://godoc.org/github.com/hyperledger/fabric-chaincode-go/shim#ChaincodeStubInterface>`__
   - `node.js <https://fabric-shim.github.io/ChaincodeStub.html>`__
-  - `Java <https://fabric-chaincode-java.github.io/master/api/org/hyperledger/fabric/shim/ChaincodeStub.html>`_
+  - `Java <https://hyperledger.github.io/fabric-chaincode-java/master/api/org/hyperledger/fabric/shim/ChaincodeStub.html>`_
 
 which is used to access and modify the ledger, and to make invocations between
 chaincodes.
diff --git a/docs/source/developapps/smartcontract.md b/docs/source/developapps/smartcontract.md
index 77497ce09a1..4bf04e75869 100644
--- a/docs/source/developapps/smartcontract.md
+++ b/docs/source/developapps/smartcontract.md
@@ -98,7 +98,7 @@ default contract class is useful in some smart contracts which have multiple con
 If you are using a TypeScript implementation, there are similar `@Contract(...)` annotations that fulfill the same purpose as in Java.
 
 For more information on the available annotations, consult the available API documentation:
-* [API documentation for Java smart contracts](https://fabric-chaincode-java.github.io/)
+* [API documentation for Java smart contracts](https://hyperledger.github.io/fabric-chaincode-java/)
 * [API documentation for Node.js smart contracts](https://fabric-shim.github.io/)
 
 These classes, annotations, and the `Context` class, were brought into scope earlier:
diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst
index 1ae2fca64cb..5f8c406cd3b 100644
--- a/docs/source/getting_started.rst
+++ b/docs/source/getting_started.rst
@@ -27,7 +27,7 @@ in various programming languages. Smart contract SDKs are available for Go, Node
 
   * `Go SDK documentation <https://github.com/hyperledger/fabric-chaincode-go>`__.
   * `Node.js SDK <https://github.com/hyperledger/fabric-chaincode-node>`__ and `Node.js SDK documentation <https://fabric-shim.github.io/>`__.
-  * `Java SDK <https://github.com/hyperledger/fabric-chaincode-java>`__ and `Java SDK documentation <https://fabric-chaincode-java.github.io/>`__.
+  * `Java SDK <https://github.com/hyperledger/fabric-chaincode-java>`__ and `Java SDK documentation <https://hyperledger.github.io/fabric-chaincode-java/>`__.
 
 Currently, Node.js and Java support the new smart contract programming model delivered in
 Hyperledger Fabric v1.4. Support for Go is planned to be delivered in a later release.