diff --git a/update.sh b/update.sh
index d900c3cf3..a26504cb1 100755
--- a/update.sh
+++ b/update.sh
@@ -20,75 +20,6 @@ replace_field() {
 	sed -ri "s/${extraSed}%%${field}%%${extraSed}/$sed_escaped_value/g" "$repo/README.md"
 }
 
-declare -A otherRepos=(
-	[aerospike]='https://github.com/aerospike/aerospike-server.docker'
-	[alpine]='https://github.com/gliderlabs/docker-alpine'
-	[arangodb]='https://github.com/arangodb/arangodb-docker'
-	[backdrop]='https://github.com/backdrop-ops/backdrop-docker'
-	[bonita]='https://github.com/Bonitasoft-Community/docker_bonita'
-	[centos]='https://github.com/CentOS/sig-cloud-instance-images'
-	[chronograf]='https://github.com/influxdata/chronograf-docker'
-	[cirros]='https://github.com/ewindisch/docker-cirros'
-	[clojure]='https://github.com/Quantisan/docker-clojure'
-	[consul]='https://github.com/hashicorp/docker-consul'
-	[crate]='https://github.com/crate/docker-crate'
-	[crux]='https://github.com/therealprologic/docker-crux'
-	[debian]='https://github.com/tianon/docker-brew-debian'
-	[docker-dev]='https://github.com/docker/docker'
-	[elixir]='https://github.com/c0b/docker-elixir'
-	[erlang]='https://github.com/c0b/docker-erlang-otp'
-	[fedora]='https://github.com/lsm5/docker-brew-fedora'
-	[gazebo]='https://github.com/osrf/docker_images'
-	[glassfish]='https://github.com/aws/aws-eb-glassfish'
-	[haskell]='https://github.com/freebroccolo/docker-haskell'
-	[hipache]='https://github.com/dotcloud/hipache'
-	[hylang]='https://github.com/hylang/hy'
-	[influxdb]='https://github.com/influxdata/influxdb-docker'
-	[iojs]='https://github.com/nodejs/docker-iojs'
-	[irssi]='https://github.com/jfrazelle/irssi'
-	[jenkins]='https://github.com/cloudbees/jenkins-ci.org-docker'
-	[jetty]='https://github.com/appropriate/docker-jetty'
-	[joomla]='https://github.com/joomla/docker-joomla'
-	[jruby]='https://github.com/cpuguy83/docker-jruby'
-	[kaazing-gateway]='https://github.com/kaazing/gateway.docker'
-	[kapacitor]='https://github.com/influxdata/kapacitor-docker'
-	[lightstreamer]='https://github.com/Lightstreamer/Docker'
-	[mageia]='https://github.com/juanluisbaptiste/docker-brew-mageia'
-	[maven]='https://github.com/carlossg/docker-maven'
-	[mongo-express]='https://github.com/mongo-express/mongo-express-docker'
-	[mono]='https://github.com/mono/docker'
-	[neo4j]='https://github.com/neo4j/docker-neo4j'
-	[neurodebian]='https://github.com/neurodebian/dockerfiles'
-	[nginx]='https://github.com/nginxinc/docker-nginx'
-	[node]='https://github.com/nodejs/docker-node'
-	[nuxeo]='https://github.com/nuxeo/docker-nuxeor'
-	[odoo]='https://github.com/odoo/docker'
-	[opensuse]='https://github.com/openSUSE/docker-containers-build'
-	[oraclelinux]='https://github.com/oracle/docker'
-	[orientdb]='https://github.com/orientechnologies/orientdb-docker'
-	[perl]='https://github.com/Perl/docker-perl'
-	[photon]='https://github.com/frapposelli/photon-docker-image'
-	[piwik]='https://github.com/piwik/docker-piwik'
-	[r-base]='https://github.com/rocker-org/rocker'
-	[rakudo]='https://github.com/perl6/docker'
-	[registry]='https://github.com/docker/docker-registry'
-	[rethinkdb]='https://github.com/stuartpb/rethinkdb-dockerfiles'
-	[rocket.chat]='https://github.com/RocketChat/Docker.Official.Image'
-	[ros]='https://github.com/osrf/docker_images'
-	[sentry]='https://github.com/getsentry/docker-sentry'
-	[solr]='https://github.com/docker-solr/solr'
-	[sonarqube]='https://github.com/SonarSource/docker-sonarqube'
-	[sourcemage]='https://github.com/vaygr/docker-sourcemage'
-	[swarm]='https://github.com/docker/swarm-library-image'
-	[telegraf]='https://github.com/influxdata/telegraf-docker'
-	[thrift]='https://github.com/ahawkins/docker-thrift'
-	[traefik]='https://github.com/containous/traefik-library-image'
-	[ubuntu-debootstrap]='https://github.com/tianon/docker-brew-ubuntu-debootstrap'
-	[ubuntu-upstart]='https://github.com/tianon/dockerfiles'
-	[ubuntu]='https://github.com/tianon/docker-brew-ubuntu-core'
-	[websphere-liberty]='https://github.com/WASdev/ci.docker'
-)
-
 dockerLatest="$(curl -fsSL 'https://get.docker.com/latest')"
 
 for repo in "${repos[@]}"; do
@@ -97,10 +28,7 @@ for repo in "${repos[@]}"; do
 	fi
 	
 	if [ -e "$repo/content.md" ]; then
-		gitRepo="${otherRepos[$repo]}"
-		if [ -z "$gitRepo" ]; then
-			gitRepo="https://github.com/docker-library/$repo"
-		fi
+		githubRepo="$(cat "$repo/github-repo")"
 		
 		mailingList="$(cat "$repo/mailing-list.md" 2>/dev/null || true)"
 		if [ "$mailingList" ]; then
@@ -191,8 +119,8 @@ for repo in "${repos[@]}"; do
 		echo '  REPO => "'"$repo"'"'
 		replace_field "$repo" 'REPO' "$repo"
 		
-		echo '  GITHUB-REPO => "'"$gitRepo"'"'
-		replace_field "$repo" 'GITHUB-REPO' "$gitRepo"
+		echo '  GITHUB-REPO => "'"$githubRepo"'"'
+		replace_field "$repo" 'GITHUB-REPO' "$githubRepo"
 		
 		echo
 	else