diff --git a/.template-helpers/user-feedback.md b/.template-helpers/user-feedback.md
index 48e7a6aa9..f313c328b 100644
--- a/.template-helpers/user-feedback.md
+++ b/.template-helpers/user-feedback.md
@@ -4,7 +4,7 @@ Documentation for this image is stored in the [`%%REPO%%/` directory](https://gi
 
 ## Issues
 
-If you have any problems with or questions about this image, please contact us %%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
 
 You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
 
@@ -12,4 +12,4 @@ You can also reach many of the official image maintainers via the `#docker-libra
 
 You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
 
-Before you start to code, we recommend discussing your plans %%MAILING-LIST%% through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
+Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/.travis.yml b/.travis.yml
index 9b2f80b3f..53d954071 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,16 @@ script:
       echo >&2 "Too long (or too many lines):$failed";
       exit 1;
     fi
+  - failed='';
+    for repo in */; do
+      if [ ! -e "$repo/github-repo" ]; then
+        failed+=" $repo";
+      fi
+    done;
+    if [ "$failed" ]; then
+    echo >&2 "Missing github-repo for:$failed";
+      exit 1;
+    fi
   - if [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then
       if [ "$(git diff --numstat "$TRAVIS_COMMIT_RANGE" -- '*/README.md')" ]; then
         echo >&2 'Error:'' at least one repo README.md has changed';
diff --git a/README.md b/README.md
index 0e3561bc6..cd796acd0 100644
--- a/README.md
+++ b/README.md
@@ -12,16 +12,23 @@ All Markdown files here are run through [tianon's fork of `markdownfmt`](https:/
 -	create a `README-short.txt` (required, 100 char max)
 -	create a `content.md` (required)
 -	create a `license.md` (required)
+-	create a `github-repo` (required)
 -	add a `logo.png` (recommended)
--	edit `update.sh` as needed (see below)
--	run `./markdownfmt.sh -l myimage` to verify that the format of your markdown files is compliant with `tianon/markdownfmt`. In case you see any file names, markdownfmt detected some issues, which might result in a failed build during continuous integration.
--	optionally run `./update.sh myimage` to generate `myimage/README.md` for review. **Note:** do not actually commit the `README.md` file; it is automatically generated/committed before being uploaded to DockerHub.
+
+Optionally:
+
+-	run `./update.sh myimage` to generate `myimage/README.md` for your review. **Note:** do not actually commit the `README.md` file; it is automatically generated/committed before being uploaded to Docker Hub.
+-	run `./markdownfmt.sh -l myimage` to verify whether format of your markdown files is compliant to `tianon/markdownfmt`. In case you see any file names, markdownfmt detected some issues, which might result in a failed build during continuous integration. run `./markdownfmt.sh -d myimage` to see a diff of changes required to pass.
+
+# How do I update an image's docs
+
+To update `README.md` for a specific image do not edit `README.md` directly. Please edit `content.md` or another appropriate file within the folder. To see the changes, run `./update.sh myimage` from the repo root, but do not add the `README.md` changes to your pull request. See also `markdownfmt.sh` point [above](#how-do-i-add-a-new-images-docs).
 
 # What are all these files?
 
 ## `update.sh`
 
-This is the main script used to generate the `README.md` files for each image. When a new image is added that is not under the `docker-library` namespace on GitHub, a new entry must be added to the `otherRepos` array in this script. Accepted arguments are which image(s) you want to update and no arguments to update all of them.
+This is the main script used to generate the `README.md` files for each image. The generated file is committed along with the files used to generate it (see below on what customizations are available). Accepted arguments are which image(s) you want to update or no arguments to update all of them.
 
 ## `generate-repo-stub-readme.sh`
 
@@ -82,18 +89,18 @@ This file should contain a link to the license for the main software in the imag
 View [license information](http://golang.org/LICENSE) for the software contained in this image.
 ```
 
+## `<image name>/github-repo`
+
+This file should contain the URL to the GitHub repository for the Dockerfiles that become the images. The file should be in a single line ending in a newline with no extraneous whitespace. Only one GitHub repo per image repository is supported. It is used in generating links. Here is an example for `golang`:
+
+```text
+https://github.com/docker-library/golang
+```
+
 ## `<image name>/user-feedback.md`
 
 This file is an optional override of the default `user-feedback.md` for those repositories with different issue and contributing policies.
 
-## `<image name>/mailing-list.md`
-
-This file is snippet that gets inserted into the user feedback section to provide and extra way to get help, like a mailing list. Here is an example from the Postgres image:
-
-```markdown
-on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or
-```
-
 # Issues and Contributing
 
 If you would like to make a new Official Image, be sure to follow the [guidelines](https://docs.docker.com/docker-hub/official_repos/) and optionally talk to officialrepos@docker.com.
diff --git a/aerospike/github-repo b/aerospike/github-repo
new file mode 100644
index 000000000..91cf2ac3e
--- /dev/null
+++ b/aerospike/github-repo
@@ -0,0 +1 @@
+https://github.com/aerospike/aerospike-server.docker
diff --git a/aerospike/mailing-list.md b/aerospike/mailing-list.md
deleted file mode 100644
index d7f3f6099..000000000
--- a/aerospike/mailing-list.md
+++ /dev/null
@@ -1 +0,0 @@
-on the [Aerospike Forums](https://discuss.aerospike.com) or
diff --git a/aerospike/user-feedback.md b/aerospike/user-feedback.md
new file mode 100644
index 000000000..3daaa2c09
--- /dev/null
+++ b/aerospike/user-feedback.md
@@ -0,0 +1,15 @@
+## Documentation
+
+Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/alpine/github-repo b/alpine/github-repo
new file mode 100644
index 000000000..6d117545b
--- /dev/null
+++ b/alpine/github-repo
@@ -0,0 +1 @@
+https://github.com/gliderlabs/docker-alpine
diff --git a/arangodb/github-repo b/arangodb/github-repo
new file mode 100644
index 000000000..a9f781738
--- /dev/null
+++ b/arangodb/github-repo
@@ -0,0 +1 @@
+https://github.com/arangodb/arangodb-docker
diff --git a/backdrop/github-repo b/backdrop/github-repo
new file mode 100644
index 000000000..188f8befd
--- /dev/null
+++ b/backdrop/github-repo
@@ -0,0 +1 @@
+https://github.com/backdrop-ops/backdrop-docker
diff --git a/bonita/github-repo b/bonita/github-repo
new file mode 100644
index 000000000..04263d6a0
--- /dev/null
+++ b/bonita/github-repo
@@ -0,0 +1 @@
+https://github.com/Bonitasoft-Community/docker_bonita
diff --git a/buildpack-deps/github-repo b/buildpack-deps/github-repo
new file mode 100644
index 000000000..751a101c2
--- /dev/null
+++ b/buildpack-deps/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/buildpack-deps
diff --git a/busybox/github-repo b/busybox/github-repo
new file mode 100644
index 000000000..e676a526c
--- /dev/null
+++ b/busybox/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/busybox
diff --git a/cassandra/github-repo b/cassandra/github-repo
new file mode 100644
index 000000000..45f6c3c95
--- /dev/null
+++ b/cassandra/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/cassandra
diff --git a/celery/github-repo b/celery/github-repo
new file mode 100644
index 000000000..5bf6376ef
--- /dev/null
+++ b/celery/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/celery
diff --git a/centos/github-repo b/centos/github-repo
new file mode 100644
index 000000000..6fdc93e0b
--- /dev/null
+++ b/centos/github-repo
@@ -0,0 +1 @@
+https://github.com/CentOS/sig-cloud-instance-images
diff --git a/centos/mailing-list.md b/centos/mailing-list.md
deleted file mode 100644
index 9608a9109..000000000
--- a/centos/mailing-list.md
+++ /dev/null
@@ -1 +0,0 @@
-by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or
diff --git a/centos/user-feedback.md b/centos/user-feedback.md
new file mode 100644
index 000000000..b4d04d4ad
--- /dev/null
+++ b/centos/user-feedback.md
@@ -0,0 +1,15 @@
+## Documentation
+
+Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/chronograf/github-repo b/chronograf/github-repo
new file mode 100644
index 000000000..38bc2a6d8
--- /dev/null
+++ b/chronograf/github-repo
@@ -0,0 +1 @@
+https://github.com/influxdata/chronograf-docker
diff --git a/cirros/github-repo b/cirros/github-repo
new file mode 100644
index 000000000..22b9802c9
--- /dev/null
+++ b/cirros/github-repo
@@ -0,0 +1 @@
+https://github.com/ewindisch/docker-cirros
diff --git a/clojure/github-repo b/clojure/github-repo
new file mode 100644
index 000000000..a6447b6b0
--- /dev/null
+++ b/clojure/github-repo
@@ -0,0 +1 @@
+https://github.com/Quantisan/docker-clojure
diff --git a/consul/github-repo b/consul/github-repo
new file mode 100644
index 000000000..d3aa632b6
--- /dev/null
+++ b/consul/github-repo
@@ -0,0 +1 @@
+https://github.com/hashicorp/docker-consul
diff --git a/couchbase/github-repo b/couchbase/github-repo
new file mode 100644
index 000000000..25d13c788
--- /dev/null
+++ b/couchbase/github-repo
@@ -0,0 +1 @@
+https://github.com/couchbase/docker
diff --git a/couchdb/github-repo b/couchdb/github-repo
new file mode 100644
index 000000000..14244e0d7
--- /dev/null
+++ b/couchdb/github-repo
@@ -0,0 +1 @@
+https://github.com/klaemo/docker-couchdb
diff --git a/crate/github-repo b/crate/github-repo
new file mode 100644
index 000000000..3f60dbc49
--- /dev/null
+++ b/crate/github-repo
@@ -0,0 +1 @@
+https://github.com/crate/docker-crate
diff --git a/crux/github-repo b/crux/github-repo
new file mode 100644
index 000000000..d14a8a15a
--- /dev/null
+++ b/crux/github-repo
@@ -0,0 +1 @@
+https://github.com/therealprologic/docker-crux
diff --git a/debian/github-repo b/debian/github-repo
new file mode 100644
index 000000000..39c17584e
--- /dev/null
+++ b/debian/github-repo
@@ -0,0 +1 @@
+https://github.com/tianon/docker-brew-debian
diff --git a/django/github-repo b/django/github-repo
new file mode 100644
index 000000000..b9a76e403
--- /dev/null
+++ b/django/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/django
diff --git a/docker-dev/github-repo b/docker-dev/github-repo
new file mode 100644
index 000000000..8f0faaddd
--- /dev/null
+++ b/docker-dev/github-repo
@@ -0,0 +1 @@
+https://github.com/docker/docker
diff --git a/docker/github-repo b/docker/github-repo
new file mode 100644
index 000000000..deabd2b97
--- /dev/null
+++ b/docker/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/docker
diff --git a/drupal/github-repo b/drupal/github-repo
new file mode 100644
index 000000000..c86cde3fd
--- /dev/null
+++ b/drupal/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/drupal
diff --git a/elasticsearch/github-repo b/elasticsearch/github-repo
new file mode 100644
index 000000000..181f18470
--- /dev/null
+++ b/elasticsearch/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/elasticsearch
diff --git a/elixir/github-repo b/elixir/github-repo
new file mode 100644
index 000000000..915f60754
--- /dev/null
+++ b/elixir/github-repo
@@ -0,0 +1 @@
+https://github.com/c0b/docker-elixir
diff --git a/erlang/github-repo b/erlang/github-repo
new file mode 100644
index 000000000..86644d827
--- /dev/null
+++ b/erlang/github-repo
@@ -0,0 +1 @@
+https://github.com/c0b/docker-erlang-otp
diff --git a/fedora/github-repo b/fedora/github-repo
new file mode 100644
index 000000000..dfd4bf804
--- /dev/null
+++ b/fedora/github-repo
@@ -0,0 +1 @@
+https://github.com/lsm5/docker-brew-fedora
diff --git a/fedora/mailing-list.md b/fedora/mailing-list.md
deleted file mode 100644
index d2e4cbee4..000000000
--- a/fedora/mailing-list.md
+++ /dev/null
@@ -1 +0,0 @@
-by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or
diff --git a/fedora/user-feedback.md b/fedora/user-feedback.md
new file mode 100644
index 000000000..3aa846ea6
--- /dev/null
+++ b/fedora/user-feedback.md
@@ -0,0 +1,15 @@
+## Documentation
+
+Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/gazebo/github-repo b/gazebo/github-repo
new file mode 100644
index 000000000..7b29247ab
--- /dev/null
+++ b/gazebo/github-repo
@@ -0,0 +1 @@
+https://github.com/osrf/docker_images
diff --git a/gcc/github-repo b/gcc/github-repo
new file mode 100644
index 000000000..c0062b0e3
--- /dev/null
+++ b/gcc/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/gcc
diff --git a/ghost/github-repo b/ghost/github-repo
new file mode 100644
index 000000000..f949c46a0
--- /dev/null
+++ b/ghost/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/ghost
diff --git a/glassfish/github-repo b/glassfish/github-repo
new file mode 100644
index 000000000..5b42dc884
--- /dev/null
+++ b/glassfish/github-repo
@@ -0,0 +1 @@
+https://github.com/aws/aws-eb-glassfish
diff --git a/golang/github-repo b/golang/github-repo
new file mode 100644
index 000000000..2a11de4c8
--- /dev/null
+++ b/golang/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/golang
diff --git a/haproxy/github-repo b/haproxy/github-repo
new file mode 100644
index 000000000..da0c8c09f
--- /dev/null
+++ b/haproxy/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/haproxy
diff --git a/haskell/github-repo b/haskell/github-repo
new file mode 100644
index 000000000..783b86139
--- /dev/null
+++ b/haskell/github-repo
@@ -0,0 +1 @@
+https://github.com/freebroccolo/docker-haskell
diff --git a/hello-world/github-repo b/hello-world/github-repo
new file mode 100644
index 000000000..7eeb11ec5
--- /dev/null
+++ b/hello-world/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/hello-world
diff --git a/hipache/github-repo b/hipache/github-repo
new file mode 100644
index 000000000..0744fd130
--- /dev/null
+++ b/hipache/github-repo
@@ -0,0 +1 @@
+https://github.com/dotcloud/hipache
diff --git a/httpd/github-repo b/httpd/github-repo
new file mode 100644
index 000000000..cd810ddd1
--- /dev/null
+++ b/httpd/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/httpd
diff --git a/hylang/github-repo b/hylang/github-repo
new file mode 100644
index 000000000..a88c90b78
--- /dev/null
+++ b/hylang/github-repo
@@ -0,0 +1 @@
+https://github.com/hylang/hy
diff --git a/influxdb/github-repo b/influxdb/github-repo
new file mode 100644
index 000000000..ac1e9321a
--- /dev/null
+++ b/influxdb/github-repo
@@ -0,0 +1 @@
+https://github.com/influxdata/influxdb-docker
diff --git a/iojs/github-repo b/iojs/github-repo
new file mode 100644
index 000000000..48123dc27
--- /dev/null
+++ b/iojs/github-repo
@@ -0,0 +1 @@
+https://github.com/nodejs/docker-iojs
diff --git a/irssi/github-repo b/irssi/github-repo
new file mode 100644
index 000000000..6267787ab
--- /dev/null
+++ b/irssi/github-repo
@@ -0,0 +1 @@
+https://github.com/jfrazelle/irssi
diff --git a/java/github-repo b/java/github-repo
new file mode 100644
index 000000000..5f97891db
--- /dev/null
+++ b/java/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/java
diff --git a/jenkins/github-repo b/jenkins/github-repo
new file mode 100644
index 000000000..128b64241
--- /dev/null
+++ b/jenkins/github-repo
@@ -0,0 +1 @@
+https://github.com/cloudbees/jenkins-ci.org-docker
diff --git a/jetty/github-repo b/jetty/github-repo
new file mode 100644
index 000000000..d72a673ca
--- /dev/null
+++ b/jetty/github-repo
@@ -0,0 +1 @@
+https://github.com/appropriate/docker-jetty
diff --git a/joomla/github-repo b/joomla/github-repo
new file mode 100644
index 000000000..6bb120cbf
--- /dev/null
+++ b/joomla/github-repo
@@ -0,0 +1 @@
+https://github.com/joomla/docker-joomla
diff --git a/jruby/github-repo b/jruby/github-repo
new file mode 100644
index 000000000..083130bae
--- /dev/null
+++ b/jruby/github-repo
@@ -0,0 +1 @@
+https://github.com/cpuguy83/docker-jruby
diff --git a/julia/github-repo b/julia/github-repo
new file mode 100644
index 000000000..284d2e9d4
--- /dev/null
+++ b/julia/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/julia
diff --git a/kaazing-gateway/github-repo b/kaazing-gateway/github-repo
new file mode 100644
index 000000000..862aa8745
--- /dev/null
+++ b/kaazing-gateway/github-repo
@@ -0,0 +1 @@
+https://github.com/kaazing/gateway.docker
diff --git a/kapacitor/github-repo b/kapacitor/github-repo
new file mode 100644
index 000000000..7f7186191
--- /dev/null
+++ b/kapacitor/github-repo
@@ -0,0 +1 @@
+https://github.com/influxdata/kapacitor-docker
diff --git a/kibana/github-repo b/kibana/github-repo
new file mode 100644
index 000000000..8d408c0b5
--- /dev/null
+++ b/kibana/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/kibana
diff --git a/lightstreamer/github-repo b/lightstreamer/github-repo
new file mode 100644
index 000000000..eb0113059
--- /dev/null
+++ b/lightstreamer/github-repo
@@ -0,0 +1 @@
+https://github.com/Lightstreamer/Docker
diff --git a/logstash/github-repo b/logstash/github-repo
new file mode 100644
index 000000000..d2d5f1ed4
--- /dev/null
+++ b/logstash/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/logstash
diff --git a/mageia/github-repo b/mageia/github-repo
new file mode 100644
index 000000000..2b697437d
--- /dev/null
+++ b/mageia/github-repo
@@ -0,0 +1 @@
+https://github.com/juanluisbaptiste/docker-brew-mageia
diff --git a/mariadb/github-repo b/mariadb/github-repo
new file mode 100644
index 000000000..5ef8d698b
--- /dev/null
+++ b/mariadb/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/mariadb
diff --git a/maven/github-repo b/maven/github-repo
new file mode 100644
index 000000000..48069a417
--- /dev/null
+++ b/maven/github-repo
@@ -0,0 +1 @@
+https://github.com/carlossg/docker-maven
diff --git a/memcached/github-repo b/memcached/github-repo
new file mode 100644
index 000000000..1d1bc966f
--- /dev/null
+++ b/memcached/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/memcached
diff --git a/mongo-express/github-repo b/mongo-express/github-repo
new file mode 100644
index 000000000..6514a0f52
--- /dev/null
+++ b/mongo-express/github-repo
@@ -0,0 +1 @@
+https://github.com/mongo-express/mongo-express-docker
diff --git a/mongo/github-repo b/mongo/github-repo
new file mode 100644
index 000000000..29372e75e
--- /dev/null
+++ b/mongo/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/mongo
diff --git a/mono/github-repo b/mono/github-repo
new file mode 100644
index 000000000..e4a96d7ac
--- /dev/null
+++ b/mono/github-repo
@@ -0,0 +1 @@
+https://github.com/mono/docker
diff --git a/mysql/github-repo b/mysql/github-repo
new file mode 100644
index 000000000..927216c93
--- /dev/null
+++ b/mysql/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/mysql
diff --git a/nats/github-repo b/nats/github-repo
new file mode 100644
index 000000000..84769dda8
--- /dev/null
+++ b/nats/github-repo
@@ -0,0 +1 @@
+https://github.com/nats-io/nats-docker
diff --git a/neo4j/github-repo b/neo4j/github-repo
new file mode 100644
index 000000000..e91dfd5d5
--- /dev/null
+++ b/neo4j/github-repo
@@ -0,0 +1 @@
+https://github.com/neo4j/docker-neo4j
diff --git a/neurodebian/github-repo b/neurodebian/github-repo
new file mode 100644
index 000000000..771f0dc4b
--- /dev/null
+++ b/neurodebian/github-repo
@@ -0,0 +1 @@
+https://github.com/neurodebian/dockerfiles
diff --git a/nginx/github-repo b/nginx/github-repo
new file mode 100644
index 000000000..d08138276
--- /dev/null
+++ b/nginx/github-repo
@@ -0,0 +1 @@
+https://github.com/nginxinc/docker-nginx
diff --git a/node/github-repo b/node/github-repo
new file mode 100644
index 000000000..4eb54652c
--- /dev/null
+++ b/node/github-repo
@@ -0,0 +1 @@
+https://github.com/nodejs/docker-node
diff --git a/notary/github-repo b/notary/github-repo
new file mode 100644
index 000000000..9b8f143ca
--- /dev/null
+++ b/notary/github-repo
@@ -0,0 +1 @@
+https://github.com/docker/notary-official-images
diff --git a/nuxeo/github-repo b/nuxeo/github-repo
new file mode 100644
index 000000000..6a3dabb9b
--- /dev/null
+++ b/nuxeo/github-repo
@@ -0,0 +1 @@
+https://github.com/nuxeo/docker-nuxeo
diff --git a/odoo/github-repo b/odoo/github-repo
new file mode 100644
index 000000000..d2b84e587
--- /dev/null
+++ b/odoo/github-repo
@@ -0,0 +1 @@
+https://github.com/odoo/docker
diff --git a/opensuse/github-repo b/opensuse/github-repo
new file mode 100644
index 000000000..f9df505de
--- /dev/null
+++ b/opensuse/github-repo
@@ -0,0 +1 @@
+https://github.com/openSUSE/docker-containers-build
diff --git a/oraclelinux/github-repo b/oraclelinux/github-repo
new file mode 100644
index 000000000..9a7490dce
--- /dev/null
+++ b/oraclelinux/github-repo
@@ -0,0 +1 @@
+https://github.com/oracle/docker
diff --git a/orientdb/github-repo b/orientdb/github-repo
new file mode 100644
index 000000000..a82c0b213
--- /dev/null
+++ b/orientdb/github-repo
@@ -0,0 +1 @@
+https://github.com/orientechnologies/orientdb-docker
diff --git a/owncloud/github-repo b/owncloud/github-repo
new file mode 100644
index 000000000..ba07df74e
--- /dev/null
+++ b/owncloud/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/owncloud
diff --git a/percona/github-repo b/percona/github-repo
new file mode 100644
index 000000000..07792b950
--- /dev/null
+++ b/percona/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/percona
diff --git a/perl/github-repo b/perl/github-repo
new file mode 100644
index 000000000..af1f1c2c2
--- /dev/null
+++ b/perl/github-repo
@@ -0,0 +1 @@
+https://github.com/Perl/docker-perl
diff --git a/photon/github-repo b/photon/github-repo
new file mode 100644
index 000000000..55298af8d
--- /dev/null
+++ b/photon/github-repo
@@ -0,0 +1 @@
+https://github.com/frapposelli/photon-docker-image
diff --git a/php-zendserver/github-repo b/php-zendserver/github-repo
new file mode 100644
index 000000000..cc0314b7c
--- /dev/null
+++ b/php-zendserver/github-repo
@@ -0,0 +1 @@
+https://github.com/zendtech/php-zendserver-docker
diff --git a/php/github-repo b/php/github-repo
new file mode 100644
index 000000000..5f7ab1b43
--- /dev/null
+++ b/php/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/php
diff --git a/piwik/github-repo b/piwik/github-repo
new file mode 100644
index 000000000..5eeb32cee
--- /dev/null
+++ b/piwik/github-repo
@@ -0,0 +1 @@
+https://github.com/piwik/docker-piwik
diff --git a/postgres/github-repo b/postgres/github-repo
new file mode 100644
index 000000000..5e141a3e5
--- /dev/null
+++ b/postgres/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/postgres
diff --git a/postgres/mailing-list.md b/postgres/mailing-list.md
deleted file mode 100644
index c33593830..000000000
--- a/postgres/mailing-list.md
+++ /dev/null
@@ -1 +0,0 @@
-on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or
diff --git a/postgres/user-feedback.md b/postgres/user-feedback.md
new file mode 100644
index 000000000..86591cb5b
--- /dev/null
+++ b/postgres/user-feedback.md
@@ -0,0 +1,15 @@
+## Documentation
+
+Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
+
+## Issues
+
+If you have any problems with or questions about this image, please contact us on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
+
+You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
+
+## Contributing
+
+You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
+
+Before you start to code, we recommend discussing your plans on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
diff --git a/pypy/github-repo b/pypy/github-repo
new file mode 100644
index 000000000..08e8502c6
--- /dev/null
+++ b/pypy/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/pypy
diff --git a/python/github-repo b/python/github-repo
new file mode 100644
index 000000000..a3188fb5a
--- /dev/null
+++ b/python/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/python
diff --git a/r-base/github-repo b/r-base/github-repo
new file mode 100644
index 000000000..b3e76d1a2
--- /dev/null
+++ b/r-base/github-repo
@@ -0,0 +1 @@
+https://github.com/rocker-org/rocker
diff --git a/rabbitmq/github-repo b/rabbitmq/github-repo
new file mode 100644
index 000000000..5df459811
--- /dev/null
+++ b/rabbitmq/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/rabbitmq
diff --git a/rails/github-repo b/rails/github-repo
new file mode 100644
index 000000000..7e99a91b5
--- /dev/null
+++ b/rails/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/rails
diff --git a/rakudo-star/github-repo b/rakudo-star/github-repo
new file mode 100644
index 000000000..8bead6a48
--- /dev/null
+++ b/rakudo-star/github-repo
@@ -0,0 +1 @@
+https://github.com/perl6/docker
diff --git a/redis/github-repo b/redis/github-repo
new file mode 100644
index 000000000..efe72763d
--- /dev/null
+++ b/redis/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/redis
diff --git a/redmine/github-repo b/redmine/github-repo
new file mode 100644
index 000000000..72a62501c
--- /dev/null
+++ b/redmine/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/redmine
diff --git a/registry/github-repo b/registry/github-repo
new file mode 100644
index 000000000..2e52f0a4b
--- /dev/null
+++ b/registry/github-repo
@@ -0,0 +1 @@
+https://github.com/docker/docker-registry
diff --git a/rethinkdb/github-repo b/rethinkdb/github-repo
new file mode 100644
index 000000000..5e458f78a
--- /dev/null
+++ b/rethinkdb/github-repo
@@ -0,0 +1 @@
+https://github.com/stuartpb/rethinkdb-dockerfiles
diff --git a/rocket.chat/github-repo b/rocket.chat/github-repo
new file mode 100644
index 000000000..752e07085
--- /dev/null
+++ b/rocket.chat/github-repo
@@ -0,0 +1 @@
+https://github.com/RocketChat/Docker.Official.Image
diff --git a/ros/github-repo b/ros/github-repo
new file mode 100644
index 000000000..7b29247ab
--- /dev/null
+++ b/ros/github-repo
@@ -0,0 +1 @@
+https://github.com/osrf/docker_images
diff --git a/ruby/github-repo b/ruby/github-repo
new file mode 100644
index 000000000..5c5d901b2
--- /dev/null
+++ b/ruby/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/ruby
diff --git a/scratch/github-repo b/scratch/github-repo
new file mode 100644
index 000000000..e69de29bb
diff --git a/sentry/github-repo b/sentry/github-repo
new file mode 100644
index 000000000..65c146629
--- /dev/null
+++ b/sentry/github-repo
@@ -0,0 +1 @@
+https://github.com/getsentry/docker-sentry
diff --git a/solr/github-repo b/solr/github-repo
new file mode 100644
index 000000000..307cafa2e
--- /dev/null
+++ b/solr/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-solr/docker-solr
diff --git a/sonarqube/github-repo b/sonarqube/github-repo
new file mode 100644
index 000000000..93330249a
--- /dev/null
+++ b/sonarqube/github-repo
@@ -0,0 +1 @@
+https://github.com/SonarSource/docker-sonarqube
diff --git a/sourcemage/github-repo b/sourcemage/github-repo
new file mode 100644
index 000000000..96bd4d3c8
--- /dev/null
+++ b/sourcemage/github-repo
@@ -0,0 +1 @@
+https://github.com/vaygr/docker-sourcemage
diff --git a/swarm/github-repo b/swarm/github-repo
new file mode 100644
index 000000000..7b66f8a5b
--- /dev/null
+++ b/swarm/github-repo
@@ -0,0 +1 @@
+https://github.com/docker/swarm-library-image
diff --git a/telegraf/github-repo b/telegraf/github-repo
new file mode 100644
index 000000000..6e8a33fa3
--- /dev/null
+++ b/telegraf/github-repo
@@ -0,0 +1 @@
+https://github.com/influxdata/telegraf-docker
diff --git a/thrift/github-repo b/thrift/github-repo
new file mode 100644
index 000000000..0610e10f9
--- /dev/null
+++ b/thrift/github-repo
@@ -0,0 +1 @@
+https://github.com/ahawkins/docker-thrift
diff --git a/tomcat/github-repo b/tomcat/github-repo
new file mode 100644
index 000000000..919637311
--- /dev/null
+++ b/tomcat/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/tomcat
diff --git a/tomee/github-repo b/tomee/github-repo
new file mode 100644
index 000000000..4fda2c7c2
--- /dev/null
+++ b/tomee/github-repo
@@ -0,0 +1 @@
+https://github.com/tomitribe/docker-tomee
diff --git a/traefik/github-repo b/traefik/github-repo
new file mode 100644
index 000000000..fce1f64e6
--- /dev/null
+++ b/traefik/github-repo
@@ -0,0 +1 @@
+https://github.com/containous/traefik-library-image
diff --git a/ubuntu-debootstrap/github-repo b/ubuntu-debootstrap/github-repo
new file mode 100644
index 000000000..a183913c5
--- /dev/null
+++ b/ubuntu-debootstrap/github-repo
@@ -0,0 +1 @@
+https://github.com/tianon/docker-brew-ubuntu-debootstrap
diff --git a/ubuntu-upstart/github-repo b/ubuntu-upstart/github-repo
new file mode 100644
index 000000000..7598e785a
--- /dev/null
+++ b/ubuntu-upstart/github-repo
@@ -0,0 +1 @@
+https://github.com/tianon/dockerfiles
diff --git a/ubuntu/github-repo b/ubuntu/github-repo
new file mode 100644
index 000000000..8adaa2c0c
--- /dev/null
+++ b/ubuntu/github-repo
@@ -0,0 +1 @@
+https://github.com/tianon/docker-brew-ubuntu-core
diff --git a/update.sh b/update.sh
index d900c3cf3..196ce3628 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
@@ -185,14 +113,11 @@ for repo in "${repos[@]}"; do
 		echo '  USER-FEEDBACK => '"$repo"'/user-feedback.md'
 		replace_field "$repo" 'USER-FEEDBACK' "$userFeedback"
 		
-		echo '  MAILING-LIST => '"$repo"'/mailing-list.md'
-		replace_field "$repo" 'MAILING-LIST' "$mailingList" '\s*'
-		
 		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
diff --git a/websphere-liberty/github-repo b/websphere-liberty/github-repo
new file mode 100644
index 000000000..542065884
--- /dev/null
+++ b/websphere-liberty/github-repo
@@ -0,0 +1 @@
+https://github.com/WASdev/ci.docker
diff --git a/wordpress/github-repo b/wordpress/github-repo
new file mode 100644
index 000000000..87767ac42
--- /dev/null
+++ b/wordpress/github-repo
@@ -0,0 +1 @@
+https://github.com/docker-library/wordpress