diff --git a/src/freedombone b/src/freedombone
index e8ddc422..f64a5c26 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -216,6 +216,7 @@ GIT_ONION_PORT=8090
 GIT_DOMAIN_REPO="https://github.com/gogits/gogs.git"
 GIT_ADMIN_PASSWORD=
 GOGS_COMMIT='efea642d6cf419c9587d44b95ff2bc04e89f7bfe'
+GO_PACKAGE_MANAGER_REPO="https://github.com/gpmgo/gopm"
 
 # Domain name for Owncloud installation
 OWNCLOUD_DOMAIN_NAME=
@@ -424,6 +425,8 @@ CJDNS_PASSWORD=
 CJDNS_PORT=
 CJDNS_REPO="https://github.com/cjdelisle/cjdns.git"
 CJDNS_COMMIT='13189fde111d0500427a7a0ce06a970753527bca'
+CJDCMD_REPO="https://github.com/inhies/cjdcmd"
+CJDCMD_COMMIT='973cca6ed0eecf9041c3403a40193c0b1291b808'
 
 # B.A.T.M.A.N settings
 ENABLE_BATMAN="no"
@@ -2291,7 +2294,7 @@ function mesh_cjdns_tools {
     fi
     export GOPATH=$HOME/projects/go
     export PATH=$PATH:$HOME/projects/go/bin
-    go get github.com/inhies/cjdcmd
+    go get $CJDCMD_REPO
     if [ ! -f $HOME/projects/go/bin/cjdcmd ]; then
         echo $'cjdcmd was not compiled. Check your golang installation'
         exit 7439
@@ -6646,7 +6649,7 @@ function install_gogs {
     if [ ! -d $GOPATH ]; then
         mkdir -p $GOPATH
     fi
-    go get -u github.com/gpmgo/gopm
+    go get -u $GO_PACKAGE_MANAGER_REPO
     if [ ! "$?" = "0" ]; then
         exit 479832
     fi
@@ -9610,7 +9613,7 @@ function install_ipfs {
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.bashrc
     fi
 
-    go get -u $IPFS_GO_REPO/cmd/ipfs
+    go get -u ${IPFS_GO_REPO}/cmd/ipfs
     if [ ! "$?" = "0" ]; then
         exit 8242
     fi