diff --git a/docs/_getting-started/private-net.md b/docs/_getting-started/private-net.md
index dd778b0aef..09be1728ad 100644
--- a/docs/_getting-started/private-net.md
+++ b/docs/_getting-started/private-net.md
@@ -9,7 +9,7 @@ controlled ethereum network is useful as a backend for network integration testi
 developers working on issues related to networking/blockchain synching/message
 propagation, etc or DAPP developers testing multi-block and multi-user scenarios).
 
-We assume you are able to build `geth` following the [build instructions](../install-and-build/build-from-source)
+We assume you are able to build `geth` following the [build instructions](../install-and-build/installing-geth)
 
 ## Setting up multiple nodes
 
diff --git a/docs/_install-and-build/Build-from-Source.md b/docs/_install-and-build/Build-from-Source.md
deleted file mode 100644
index 6e575a6b09..0000000000
--- a/docs/_install-and-build/Build-from-Source.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: Build from source
-sort_key: B
----
-<!-- TODO: Maybe move? -->
-
-Go Ethereum (as its name implies) is written in [Go](https://golang.org), and as such to build from source code you need to have a Go version as recent as possible. This guide does not go into details on how to install Go itself, for that please read the [Go installation instructions](https://golang.org/doc/install).
-
-Assuming you have Go installed, you can download our project via:
-
-```shell
-go get -d github.com/ethereum/go-ethereum
-```
-
-The above command will checkout the default version of Go Ethereum into your local `GOPATH` work space, but it will not build any executables for you. To do that you can either build one specifically:
-
-    go install github.com/ethereum/go-ethereum/cmd/geth
-
-Or you can also build the entire project and install `geth` along with all developer tools by running `go install ./...` in the repository root inside your `GOPATH` work space.
-
-### Building without a Go workflow
-
-If you do not want to set up Go work spaces on your machine, only build `geth` and forget about the build process, you can clone our repository directly into a folder of your choosing and invoke `make`, which will configure everything for a temporary build and clean up after itself:
-
-    git clone https://github.com/ethereum/go-ethereum.git
-    cd go-ethereum
-    make geth
-
-This will create a `geth` (or `geth.exe` on Windows) executable file in the `go-ethereum/build/bin` folder that you can move wherever you want to run from. The binary is standalone and doesn't require any additional files.
diff --git a/docs/_install-and-build/Installing-Geth.md b/docs/_install-and-build/Installing-Geth.md
index cb78954eb8..c6b92ed1a9 100644
--- a/docs/_install-and-build/Installing-Geth.md
+++ b/docs/_install-and-build/Installing-Geth.md
@@ -259,4 +259,8 @@ make geth
 
 These commands create a `geth` executable file in the `go-ethereum/build/bin` folder that you can move wherever you want to run from. The binary is standalone and doesn't require any additional files.
 
+Additionally you can compile all additional tools go-ethereum comes with by running `make all`. A list of all tools can be found [here](https://github.com/ethereum/go-ethereum/tree/master/cmd).
+
+If you want to cross-compile to another architecture check out the [cross-compilation guide](./cross-compile).
+
 If you want to build a stable release, the v1.9.21 release for example, you can use `git checkout v1.9.21` before running `make geth` to switch to a stable branch.