diff --git a/README.md b/README.md
index 7fc984868f..22d13fcb22 100644
--- a/README.md
+++ b/README.md
@@ -219,3 +219,6 @@ FreshRSS
 
 Folding@Home
 - https://github.com/FoldingAtHome
+
+OpenBazaar
+- https://github.com/OpenBazaar/openbazaar-go
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 88e01ab25b..eb6482e985 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -3844,23 +3844,23 @@ We work around this error by running APT a second time. Please do not worry and
 			#	x86_64
 			if (( $G_HW_ARCH == 10 )); then
 
-				INSTALL_URL_ADDRESS='https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz'
+				INSTALL_URL_ADDRESS='https://dl.google.com/go/go1.11.linux-amd64.tar.gz'
 
 			#	ARMv8
 			elif (( $G_HW_ARCH == 3 )); then
 
-				INSTALL_URL_ADDRESS='https://storage.googleapis.com/golang/go1.9.linux-arm64.tar.gz'
+				INSTALL_URL_ADDRESS='https://dl.google.com/go/go1.11.linux-arm64.tar.gz'
 
 			#	ARMv6/7
 			else
 
-				INSTALL_URL_ADDRESS='https://storage.googleapis.com/golang/go1.9.linux-armv6l.tar.gz'
+				INSTALL_URL_ADDRESS='https://dl.google.com/go/go1.11.linux-armv6l.tar.gz'
 
 			fi
 
 			Download_Install "$INSTALL_URL_ADDRESS" /usr/local/
 
-			mkdir -p $G_FP_DIETPI_USERDATA/go.sh
+			mkdir -p $G_FP_DIETPI_USERDATA/go
 			cat << _EOF_ > /etc/bashrc.d/go.sh
 #!/bin/bash
 export GOPATH=$G_FP_DIETPI_USERDATA/go