diff --git a/.gitignore b/.gitignore
index 0d20b6487c61e..b8911f7b94cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *.pyc
+/bashbrew/logs
+/bashbrew/src
diff --git a/.travis.yml b/.travis.yml
index 2db3b76f35508..00936ebd030b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,9 @@ language: bash
 # allow for use of Docker-based workers
 sudo: false
 
+before_script:
+    - env | sort
+
 # --no-build because we has no Docker in Travis :)
 script:
-    - ./bashbrew/build.sh --no-build --all
-    - ./bashbrew/push.sh --no-push --all
+    - ./bashbrew/travis.sh
diff --git a/README.md b/README.md
index 057bed8a7d913..02664c7f86785 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,16 @@ possible, but if you find yourself lost, don't hesitate to seek us out
 on Freenode IRC in channel `#docker-library`, or by creating a GitHub
 issue here.
 
+Be sure to familiarize yourself with the [Guidelines for Creating and
+Documenting Official
+Repositories](https://docs.docker.com/docker-hub/official_repos/) and the [Best
+practices for writing
+Dockerfiles](https://docs.docker.com/articles/dockerfile_best-practices/) in the
+Docker documentation.
+
+Also, the documentation for these images is currently stored separately in the
+[docker-library/docs](https://github.com/docker-library/docs) repository.
+
 ## Library definition files
 
 The library definition files are plain text files found in the `library/`
diff --git a/bashbrew/bashbrew.sh b/bashbrew/bashbrew.sh
new file mode 100755
index 0000000000000..856d2b87eba40
--- /dev/null
+++ b/bashbrew/bashbrew.sh
@@ -0,0 +1,379 @@
+#!/bin/bash
+set -e
+
+# so we can have fancy stuff like !(pattern)
+shopt -s extglob
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+library="$dir/../library"
+src="$dir/src"
+logs="$dir/logs"
+namespaces='_'
+docker='docker'
+
+library="$(readlink -f "$library")"
+src="$(readlink -f "$src")"
+logs="$(readlink -f "$logs")"
+
+self="$(basename "$0")"
+
+usage() {
+	cat <<EOUSAGE
+
+usage: $self [build|push|list] [options] [repo[:tag] ...]
+   ie: $self build --all
+       $self push debian ubuntu:12.04
+       $self list --namespaces='_' debian:7 hello-world
+
+This script processes the specified Docker images using the corresponding
+repository manifest files.
+
+common options:
+  --all              Build all repositories specified in library
+  --docker="$docker"
+                     Use a custom Docker binary
+  --help, -h, -?     Print this help message
+  --library="$library"
+                     Where to find repository manifest files
+  --logs="$logs"
+                     Where to store the build logs
+  --namespaces="$namespaces"
+                     Space separated list of image namespaces to act upon
+                     
+                     Note that "_" is a special case here for the unprefixed
+                     namespace (ie, "debian" vs "library/debian"), and as such
+                     will be implicitly ignored by the "push" subcommand
+                     
+                     Also note that "build" will always tag to the unprefixed
+                     namespace because it is necessary to do so for dependent
+                     images to use FROM correctly (think "onbuild" variants that
+                     are "FROM base-image:some-version")
+
+build options:
+  --no-build         Don't build, print what would build
+  --no-clone         Don't pull/clone Git repositories
+  --src="$src"
+                     Where to store cloned Git repositories (GOPATH style)
+
+push options:
+  --no-push          Don't push, print what would push
+
+EOUSAGE
+}
+
+# arg handling
+opts="$(getopt -o 'h?' --long 'all,docker:,help,library:,logs:,namespaces:,no-build,no-clone,no-push,src:' -- "$@" || { usage >&2 && false; })"
+eval set -- "$opts"
+
+doClone=1
+doBuild=1
+doPush=1
+buildAll=
+while true; do
+	flag=$1
+	shift
+	case "$flag" in
+		--all) buildAll=1 ;;
+		--docker) docker="$1" && shift ;;
+		--help|-h|'-?') usage && exit 0 ;;
+		--library) library="$1" && shift ;;
+		--logs) logs="$1" && shift ;;
+		--namespaces) namespaces="$1" && shift ;;
+		--no-build) doBuild= ;;
+		--no-clone) doClone= ;;
+		--no-push) doPush= ;;
+		--src) src="$1" && shift ;;
+		--) break ;;
+		*)
+			{
+				echo "error: unknown flag: $flag"
+				usage
+			} >&2
+			exit 1
+			;;
+	esac
+done
+
+# which subcommand
+subcommand="$1"
+case "$subcommand" in
+	build|push|list)
+		shift
+		;;
+	*)
+		{
+			echo "error: unknown subcommand: $1"
+			usage
+		} >&2
+		exit 1
+		;;
+esac
+
+repos=()
+if [ "$buildAll" ]; then
+	repos=( "$library"/!(MAINTAINERS) )
+fi
+repos+=( "$@" )
+
+repos=( "${repos[@]%/}" )
+
+if [ "${#repos[@]}" -eq 0 ]; then
+	{
+		echo 'error: no repos specified'
+		usage
+	} >&2
+	exit 1
+fi
+
+# globals for handling the repo queue and repo info parsed from library
+queue=()
+declare -A repoGitRepo=()
+declare -A repoGitRef=()
+declare -A repoGitDir=()
+
+logDir="$logs/$subcommand-$(date +'%Y-%m-%d--%H-%M-%S')"
+mkdir -p "$logDir"
+
+latestLogDir="$logs/latest" # this gets shiny symlinks to the latest buildlog for each repo we've seen since the creation of the logs dir
+mkdir -p "$latestLogDir"
+
+didFail=
+
+# gather all the `repo:tag` combos to build
+for repoTag in "${repos[@]}"; do
+	repo="${repoTag%%:*}"
+	tag="${repoTag#*:}"
+	[ "$repo" != "$tag" ] || tag=
+	
+	if [ "$repo" = 'http' -o "$repo" = 'https' ] && [[ "$tag" == //* ]]; then
+		# IT'S A URL!
+		repoUrl="$repo:${tag%:*}"
+		repo="$(basename "$repoUrl")"
+		if [ "${tag##*:}" != "$tag" ]; then
+			tag="${tag##*:}"
+		else
+			tag=
+		fi
+		repoTag="${repo}${tag:+:$tag}"
+		
+		echo "$repoTag ($repoUrl)" >> "$logDir/repos.txt"
+		
+		cmd=( curl -sSL --compressed "$repoUrl" )
+	else
+		if [ -f "$repo" ]; then
+			repoFile="$repo"
+			repo="$(basename "$repoFile")"
+			repoTag="${repo}${tag:+:$tag}"
+		else
+			repoFile="$library/$repo"
+		fi
+		
+		repoFile="$(readlink -f "$repoFile")"
+		echo "$repoTag ($repoFile)" >> "$logDir/repos.txt"
+		
+		cmd=( cat "$repoFile" )
+	fi
+	
+	if [ "${repoGitRepo[$repoTag]}" ]; then
+		queue+=( "$repoTag" )
+		continue
+	fi
+	
+	# parse the repo library file
+	IFS=$'\n'
+	repoTagLines=( $("${cmd[@]}" | grep -vE '^#|^\s*$') )
+	unset IFS
+	
+	tags=()
+	for line in "${repoTagLines[@]}"; do
+		tag="$(echo "$line" | awk -F ': +' '{ print $1 }')"
+		for parsedRepoTag in "${tags[@]}"; do
+			if [ "$repo:$tag" = "$parsedRepoTag" ]; then
+				echo >&2 "error: tag '$tag' is duplicated in '${cmd[@]}'"
+				exit 1
+			fi
+		done
+		
+		repoDir="$(echo "$line" | awk -F ': +' '{ print $2 }')"
+		
+		gitUrl="${repoDir%%@*}"
+		commitDir="${repoDir#*@}"
+		gitRef="${commitDir%% *}"
+		gitDir="${commitDir#* }"
+		if [ "$gitDir" = "$commitDir" ]; then
+			gitDir=
+		fi
+		
+		gitRepo="${gitUrl#*://}"
+		gitRepo="${gitRepo%/}"
+		gitRepo="${gitRepo%.git}"
+		gitRepo="${gitRepo%/}"
+		gitRepo="$src/$gitRepo"
+		
+		if [ "$subcommand" == 'build' ]; then
+			if [ -z "$doClone" ]; then
+				if [ "$doBuild" -a ! -d "$gitRepo" ]; then
+					echo >&2 "error: directory not found: $gitRepo"
+					exit 1
+				fi
+			else
+				if [ ! -d "$gitRepo" ]; then
+					mkdir -p "$(dirname "$gitRepo")"
+					echo "Cloning $repo ($gitUrl) ..."
+					git clone -q "$gitUrl" "$gitRepo"
+				else
+					# if we don't have the "ref" specified, "git fetch" in the hopes that we get it
+					if ! (
+						cd "$gitRepo"
+						git rev-parse --verify "${gitRef}^{commit}" &> /dev/null
+					); then
+						echo "Fetching $repo ($gitUrl) ..."
+						(
+							cd "$gitRepo"
+							git fetch -q --all
+							git fetch -q --tags
+						)
+					fi
+				fi
+				
+				# disable any automatic garbage collection too, just to help make sure we keep our dangling commit objects
+				( cd "$gitRepo" && git config gc.auto 0 )
+			fi
+		fi
+		
+		repoGitRepo[$repo:$tag]="$gitRepo"
+		repoGitRef[$repo:$tag]="$gitRef"
+		repoGitDir[$repo:$tag]="$gitDir"
+		tags+=( "$repo:$tag" )
+	done
+	
+	if [ "$repo" = "$repoTag" ]; then
+		# add all tags we just parsed
+		queue+=( "${tags[@]}" )
+	else
+		queue+=( "$repoTag" )
+	fi
+done
+
+set -- "${queue[@]}"
+while [ "$#" -gt 0 ]; do
+	repoTag="$1"
+	gitRepo="${repoGitRepo[$repoTag]}"
+	gitRef="${repoGitRef[$repoTag]}"
+	gitDir="${repoGitDir[$repoTag]}"
+	shift
+	if [ -z "$gitRepo" ]; then
+		echo >&2 'Unknown repo:tag:' "$repoTag"
+		didFail=1
+		continue
+	fi
+	
+	thisLog="$logDir/$subcommand-$repoTag.log"
+	touch "$thisLog"
+	ln -sf "$thisLog" "$latestLogDir/$(basename "$thisLog")"
+	
+	case "$subcommand" in
+		build)
+			echo "Processing $repoTag ..."
+			
+			if ! ( cd "$gitRepo" && git rev-parse --verify "${gitRef}^{commit}" &> /dev/null ); then
+				echo "- failed; invalid ref: $gitRef"
+				didFail=1
+				continue
+			fi
+			
+			dockerfilePath="$gitDir/Dockerfile"
+			dockerfilePath="${dockerfilePath#/}" # strip leading "/" (for when gitDir is '') because "git show" doesn't like it
+			
+			if ! dockerfile="$(cd "$gitRepo" && git show "$gitRef":"$dockerfilePath")"; then
+				echo "- failed; missing '$dockerfilePath' at '$gitRef' ?"
+				didFail=1
+				continue
+			fi
+			
+			IFS=$'\n'
+			froms=( $(echo "$dockerfile" | awk 'toupper($1) == "FROM" { print $2 ~ /:/ ? $2 : $2":latest" }') )
+			unset IFS
+			
+			for from in "${froms[@]}"; do
+				for queuedRepoTag in "$@"; do
+					if [ "$from" = "$queuedRepoTag" ]; then
+						# a "FROM" in this image is being built later in our queue, so let's bail on this image for now and come back later
+						echo "- deferred; FROM $from"
+						set -- "$@" "$repoTag"
+						continue 3
+					fi
+				done
+			done
+			
+			if [ "$doBuild" ]; then
+				if ! (
+					set -x
+					cd "$gitRepo"
+					git reset -q HEAD
+					git checkout -q -- .
+					git clean -dfxq
+					git checkout -q "$gitRef" --
+					cd "$gitRepo/$gitDir"
+					"$dir/git-set-mtimes"
+				) &>> "$thisLog"; then
+					echo "- failed 'git checkout'; see $thisLog"
+					didFail=1
+					continue
+				fi
+				
+				if ! (
+					set -x
+					"$docker" build -t "$repoTag" "$gitRepo/$gitDir"
+				) &>> "$thisLog"; then
+					echo "- failed 'docker build'; see $thisLog"
+					didFail=1
+					continue
+				fi
+				
+				for namespace in $namespaces; do
+					if [ "$namespace" = '_' ]; then
+						# images FROM other images is explicitly supported
+						continue
+					fi
+					if ! (
+						set -x
+						"$docker" tag -f "$repoTag" "$namespace/$repoTag"
+					) &>> "$thisLog"; then
+						echo "- failed 'docker tag'; see $thisLog"
+						didFail=1
+						continue
+					fi
+				done
+			fi
+			;;
+		list)
+			for namespace in $namespaces; do
+				if [ "$namespace" = '_' ]; then
+					echo "$repoTag"
+				else
+					echo "$namespace/$repoTag"
+				fi
+			done
+			;;
+		push)
+			for namespace in $namespaces; do
+				if [ "$namespace" = '_' ]; then
+					# can't "docker push debian"; skip this namespace
+					continue
+				fi
+				if [ "$doPush" ]; then
+					echo "Pushing $namespace/$repoTag..."
+					if ! "$docker" push "$namespace/$repoTag" &>> "$thisLog" < /dev/null; then
+						echo >&2 "- $namespace/$repoTag failed to push; see $thisLog"
+					fi
+				else
+					echo "$docker push" "$namespace/$repoTag"
+				fi
+			done
+			;;
+	esac
+done
+
+[ -z "$didFail" ]
diff --git a/bashbrew/build.sh b/bashbrew/build.sh
deleted file mode 100755
index 20bd5cf8ed3af..0000000000000
--- a/bashbrew/build.sh
+++ /dev/null
@@ -1,296 +0,0 @@
-#!/bin/bash
-set -e
-
-# so we can have fancy stuff like !(pattern)
-shopt -s extglob
-
-dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-library="$dir/../library"
-src="$dir/src"
-logs="$dir/logs"
-namespaces='library stackbrew'
-docker='docker'
-
-library="$(readlink -f "$library")"
-src="$(readlink -f "$src")"
-logs="$(readlink -f "$logs")"
-
-# arg handling: all args are [repo|repo:tag]
-usage() {
-	cat <<EOUSAGE
-
-usage: $0 [options] [repo[:tag] ...]
-   ie: $0 --all
-       $0 debian ubuntu:12.04
-
-   This script builds the Docker images specified using the Git repositories
-   specified in the library files.
-
-options:
-  --help, -h, -?     Print this help message
-  --all              Builds all Docker repos specified in library
-  --no-clone         Don't pull the Git repos
-  --no-build         Don't build, just echo what would have built
-  --library="$library"
-                     Where to find repository manifest files
-  --src="$src"
-                     Where to store the cloned Git repositories
-  --logs="$logs"
-                     Where to store the build logs
-  --namespaces="$namespaces"
-                     Space separated list of namespaces to tag images in after
-                     building
-  --docker="$docker"
-                     Use a custom Docker binary.
-
-EOUSAGE
-}
-
-opts="$(getopt -o 'h?' --long 'help,all,no-clone,no-build,library:,src:,logs:,namespaces:,docker:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-doClone=1
-doBuild=1
-buildAll=
-while true; do
-	flag=$1
-	shift
-	case "$flag" in
-		--help|-h|'-?')
-			usage
-			exit 0
-			;;
-		--all) buildAll=1 ;;
-		--no-clone) doClone= ;;
-		--no-build) doBuild= ;;
-		--library) library="$1" && shift ;;
-		--src) src="$1" && shift ;;
-		--logs) logs="$1" && shift ;;
-		--namespaces) namespaces="$1" && shift ;;
-		--docker) docker="$1" && shift ;;
-		--)
-			break
-			;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-repos=()
-if [ "$buildAll" ]; then
-	repos=( "$library"/!(MAINTAINERS) )
-fi
-repos+=( "$@" )
-
-repos=( "${repos[@]%/}" )
-
-if [ "${#repos[@]}" -eq 0 ]; then
-	echo >&2 'error: no repos specified'
-	usage >&2
-	exit 1
-fi
-
-# globals for handling the repo queue and repo info parsed from library
-queue=()
-declare -A repoGitRepo=()
-declare -A repoGitRef=()
-declare -A repoGitDir=()
-
-logDir="$logs/build-$(date +'%Y-%m-%d--%H-%M-%S')"
-mkdir -p "$logDir"
-
-latestLogDir="$logs/latest" # this gets shiny symlinks to the latest buildlog for each repo we've seen since the creation of the logs dir
-mkdir -p "$latestLogDir"
-
-didFail=
-
-# gather all the `repo:tag` combos to build
-for repoTag in "${repos[@]}"; do
-	repo="${repoTag%%:*}"
-	tag="${repoTag#*:}"
-	[ "$repo" != "$tag" ] || tag=
-	
-	if [ "$repo" = 'http' -o "$repo" = 'https' ] && [[ "$tag" == //* ]]; then
-		# IT'S A URL!
-		repoUrl="$repo:${tag%:*}"
-		repo="$(basename "$repoUrl")"
-		if [ "${tag##*:}" != "$tag" ]; then
-			tag="${tag##*:}"
-		else
-			tag=
-		fi
-		repoTag="${repo}${tag:+:$tag}"
-		
-		echo "$repoTag ($repoUrl)" >> "$logDir/repos.txt"
-		
-		cmd=( curl -sSL --compressed "$repoUrl" )
-	else
-		if [ -f "$repo" ]; then
-			repoFile="$repo"
-			repo="$(basename "$repoFile")"
-			repoTag="${repo}${tag:+:$tag}"
-		else
-			repoFile="$library/$repo"
-		fi
-		
-		repoFile="$(readlink -f "$repoFile")"
-		echo "$repoTag ($repoFile)" >> "$logDir/repos.txt"
-		
-		cmd=( cat "$repoFile" )
-	fi
-	
-	if [ "${repoGitRepo[$repoTag]}" ]; then
-		queue+=( "$repoTag" )
-		continue
-	fi
-	
-	# parse the repo library file
-	IFS=$'\n'
-	repoTagLines=( $("${cmd[@]}" | grep -vE '^#|^\s*$') )
-	unset IFS
-	
-	tags=()
-	for line in "${repoTagLines[@]}"; do
-		tag="$(echo "$line" | awk -F ': +' '{ print $1 }')"
-		repoDir="$(echo "$line" | awk -F ': +' '{ print $2 }')"
-		
-		gitUrl="${repoDir%%@*}"
-		commitDir="${repoDir#*@}"
-		gitRef="${commitDir%% *}"
-		gitDir="${commitDir#* }"
-		if [ "$gitDir" = "$commitDir" ]; then
-			gitDir=
-		fi
-		
-		gitRepo="${gitUrl#*://}"
-		gitRepo="${gitRepo%/}"
-		gitRepo="${gitRepo%.git}"
-		gitRepo="${gitRepo%/}"
-		gitRepo="$src/$gitRepo"
-		
-		if [ -z "$doClone" ]; then
-			if [ "$doBuild" -a ! -d "$gitRepo" ]; then
-				echo >&2 "error: directory not found: $gitRepo"
-				exit 1
-			fi
-		else
-			if [ ! -d "$gitRepo" ]; then
-				mkdir -p "$(dirname "$gitRepo")"
-				echo "Cloning $repo ($gitUrl) ..."
-				git clone -q "$gitUrl" "$gitRepo"
-			else
-				# if we don't have the "ref" specified, "git fetch" in the hopes that we get it
-				if ! (
-					cd "$gitRepo"
-					git rev-parse --verify "${gitRef}^{commit}" &> /dev/null
-				); then
-					echo "Fetching $repo ($gitUrl) ..."
-					(
-						cd "$gitRepo"
-						git fetch -q --all
-						git fetch -q --tags
-					)
-				fi
-			fi
-			
-			# disable any automatic garbage collection too, just to help make sure we keep our dangling commit objects
-			( cd "$gitRepo" && git config gc.auto 0 )
-		fi
-		
-		repoGitRepo[$repo:$tag]="$gitRepo"
-		repoGitRef[$repo:$tag]="$gitRef"
-		repoGitDir[$repo:$tag]="$gitDir"
-		tags+=( "$repo:$tag" )
-	done
-	
-	if [ "$repo" = "$repoTag" ]; then
-		# add all tags we just parsed
-		queue+=( "${tags[@]}" )
-	else
-		queue+=( "$repoTag" )
-	fi
-done
-
-set -- "${queue[@]}"
-while [ "$#" -gt 0 ]; do
-	repoTag="$1"
-	gitRepo="${repoGitRepo[$repoTag]}"
-	gitRef="${repoGitRef[$repoTag]}"
-	gitDir="${repoGitDir[$repoTag]}"
-	shift
-	if [ -z "$gitRepo" ]; then
-		echo >&2 'Unknown repo:tag:' "$repoTag"
-		didFail=1
-		continue
-	fi
-	
-	echo "Processing $repoTag ..."
-	
-	thisLog="$logDir/build-$repoTag.log"
-	touch "$thisLog"
-	ln -sf "$thisLog" "$latestLogDir/$(basename "$thisLog")"
-	
-	if ! ( cd "$gitRepo" && git rev-parse --verify "${gitRef}^{commit}" &> /dev/null ); then
-		echo "- failed; invalid ref: $gitRef"
-		didFail=1
-		continue
-	fi
-	
-	dockerfilePath="$gitDir/Dockerfile"
-	dockerfilePath="${dockerfilePath#/}" # strip leading "/" (for when gitDir is '') because "git show" doesn't like it
-	
-	if ! dockerfile="$(cd "$gitRepo" && git show "$gitRef":"$dockerfilePath")"; then
-		echo "- failed; missing '$dockerfilePath' at '$gitRef' ?"
-		didFail=1
-		continue
-	fi
-	
-	IFS=$'\n'
-	froms=( $(echo "$dockerfile" | awk 'toupper($1) == "FROM" { print $2 ~ /:/ ? $2 : $2":latest" }') )
-	unset IFS
-	
-	for from in "${froms[@]}"; do
-		for queuedRepoTag in "$@"; do
-			if [ "$from" = "$queuedRepoTag" ]; then
-				# a "FROM" in this image is being built later in our queue, so let's bail on this image for now and come back later
-				echo "- deferred; FROM $from"
-				set -- "$@" "$repoTag"
-				continue 3
-			fi
-		done
-	done
-	
-	if [ "$doBuild" ]; then
-		(
-			set -x
-			cd "$gitRepo"
-			git reset -q HEAD
-			git checkout -q -- .
-			git clean -dfxq
-			git checkout -q "$gitRef" --
-			cd "$gitRepo/$gitDir"
-			"$dir/git-set-mtimes"
-		) &>> "$thisLog"
-		
-		if ! (
-			set -x
-			"$docker" build -t "$repoTag" "$gitRepo/$gitDir"
-		) &>> "$thisLog"; then
-			echo "- failed; see $thisLog"
-			didFail=1
-			continue
-		fi
-		
-		for namespace in $namespaces; do
-			( set -x; "$docker" tag "$repoTag" "$namespace/$repoTag" ) &>> "$thisLog"
-		done
-	fi
-done
-
-[ -z "$didFail" ]
diff --git a/bashbrew/build.sh b/bashbrew/build.sh
new file mode 120000
index 0000000000000..7df4b3cc4c3c8
--- /dev/null
+++ b/bashbrew/build.sh
@@ -0,0 +1 @@
+deprecated.sh
\ No newline at end of file
diff --git a/bashbrew/deprecated.sh b/bashbrew/deprecated.sh
new file mode 100755
index 0000000000000..78239640748bb
--- /dev/null
+++ b/bashbrew/deprecated.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
+cmd="$(basename "$0" '.sh')"
+
+echo >&2 "warning: '$0' is deprecated, and '$dir/bashbrew.sh $cmd' should be used directly instead"
+
+exec "$dir/bashbrew.sh" "$cmd" "$@"
diff --git a/bashbrew/push.sh b/bashbrew/push.sh
deleted file mode 100755
index 3e3bd77d9a062..0000000000000
--- a/bashbrew/push.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-set -e
-
-# so we can have fancy stuff like !(pattern)
-shopt -s extglob
-
-dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-library="$dir/../library"
-logs="$dir/logs"
-namespaces='library stackbrew'
-docker='docker'
-
-library="$(readlink -f "$library")"
-logs="$(readlink -f "$logs")"
-# TODO actually log stuff
-
-# arg handling: all args are [repo|repo:tag]
-usage() {
-	cat <<EOUSAGE
-
-usage: $0 [options] [repo[:tag] ...]
-   ie: $0 --all
-       $0 debian ubuntu:12.04
-
-   This script pushes the specified Docker images from library that are built
-   and tagged in the specified namespaces.
-
-options:
-  --help, -h, -?     Print this help message
-  --all              Pushes all Docker images built for the given namespaces
-  --no-push          Don't actually push the images to the Docker Hub
-  --library="$library"
-                     Where to find repository manifest files
-  --namespaces="$namespaces"
-                     Space separated list of namespaces to tag images in after
-                     building
-  --docker="$docker"
-                     Use a custom Docker binary.
-
-EOUSAGE
-}
-
-opts="$(getopt -o 'h?' --long 'help,all,no-push,library:,logs:,namespaces:,docker:' -- "$@" || { usage >&2 && false; })"
-eval set -- "$opts"
-
-doPush=1
-buildAll=
-while true; do
-	flag=$1
-	shift
-	case "$flag" in
-		--help|-h|'-?')
-			usage
-			exit 0
-			;;
-		--all) buildAll=1 ;;
-		--no-push) doPush= ;;
-		--library) library="$1" && shift ;;
-		--logs) logs="$1" && shift ;;
-		--namespaces) namespaces="$1" && shift ;;
-		--docker) docker="$1" && shift ;;
-		--)
-			break
-			;;
-		*)
-			{
-				echo "error: unknown flag: $flag"
-				usage
-			} >&2
-			exit 1
-			;;
-	esac
-done
-
-repos=()
-if [ "$buildAll" ]; then
-	repos=( "$library"/!(MAINTAINERS) )
-fi
-repos+=( "$@" )
-
-repos=( "${repos[@]%/}" )
-
-if [ "${#repos[@]}" -eq 0 ]; then
-	echo >&2 'error: no repos specified'
-	usage >&2
-	exit 1
-fi
-
-for repoTag in "${repos[@]}"; do
-	repo="${repoTag%%:*}"
-	tag="${repoTag#*:}"
-	[ "$repo" != "$tag" ] || tag=
-	
-	if [ -f "$repo" ]; then
-		repoFile="$repo"
-		repo="$(basename "$repoFile")"
-		repoTag="${repo}${tag:+:$tag}"
-	else
-		repoFile="$library/$repo"
-	fi
-	
-	repoFile="$(readlink -f "$repoFile")"
-	
-	# parse the repo library file
-	IFS=$'\n'
-	tagList=( $(awk -F ': +' '!/^#|^\s*$/ { print $1 }' "$repoFile") )
-	unset IFS
-	
-	tags=()
-	for tag in "${tagList[@]}"; do
-		tags+=( "$repo:$tag" )
-	done
-	
-	pushes=()
-	if [ "$repo" = "$repoTag" ]; then
-		pushes=( "${tags[@]}" )
-	else
-		pushes+=( "$repoTag" )
-	fi
-	
-	for pushTag in "${pushes[@]}"; do
-		for namespace in $namespaces; do
-			if [ "$doPush" ]; then
-				if ! "$docker" push "$namespace/$pushTag"; then
-					echo >&2 "- $namespace/$pushTag failed to push!"
-				fi
-			else
-				echo "$docker push" "$namespace/$pushTag"
-			fi
-		done
-	done
-done
diff --git a/bashbrew/push.sh b/bashbrew/push.sh
new file mode 120000
index 0000000000000..7df4b3cc4c3c8
--- /dev/null
+++ b/bashbrew/push.sh
@@ -0,0 +1 @@
+deprecated.sh
\ No newline at end of file
diff --git a/bashbrew/travis.sh b/bashbrew/travis.sh
new file mode 100755
index 0000000000000..4c8f3a7df9949
--- /dev/null
+++ b/bashbrew/travis.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+repos=( --all )
+
+upstreamRepo='docker-library/official-images'
+upstreamBranch='master'
+if [ "$TRAVIS_PULL_REQUEST" -a "$TRAVIS_PULL_REQUEST" != 'false' ]; then
+	upstreamRepo="$TRAVIS_REPO_SLUG"
+	upstreamBranch="$TRAVIS_BRANCH"
+fi
+
+HEAD="$(git rev-parse --verify HEAD)"
+
+git fetch -q "https://github.com/$upstreamRepo.git" "refs/heads/$upstreamBranch"
+UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
+
+if [ "$(git diff --numstat "$UPSTREAM...$HEAD" -- . | wc -l)" -ne 0 ]; then
+	# changes in bashbrew/ -- keep "--all" so we test the bashbrew script changes appropriately
+	echo >&2 'Changes in bashbrew/ detected!'
+else
+	repos=( $(git diff --numstat "$UPSTREAM...$HEAD" -- ../library | awk -F '/' '{ print $2 }') )
+fi
+
+if [ "${#repos[@]}" -eq 0 ]; then
+	echo >&2 'Skipping test builds: no changes to library/ or bashbrew/ in PR'
+	exit
+fi
+
+# --no-build because we has no Docker in Travis :)
+# TODO that will change eventually!
+
+set -x
+./bashbrew.sh list --namespaces='_' "${repos[@]}"
+./bashbrew.sh build --no-build "${repos[@]}"
+./bashbrew.sh push --no-push "${repos[@]}"
diff --git a/library/buildpack-deps b/library/buildpack-deps
index bbac8c9bef030..0473316f9bbb6 100644
--- a/library/buildpack-deps
+++ b/library/buildpack-deps
@@ -1,6 +1,15 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-jessie: git://github.com/docker-library/docker-buildpack-deps@a201b127ddf29f47738a9fd04b2f004eb41b009f jessie
-latest: git://github.com/docker-library/docker-buildpack-deps@a201b127ddf29f47738a9fd04b2f004eb41b009f jessie
+jessie-micro: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad jessie/micro
+micro: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad jessie/micro
 
-wheezy: git://github.com/docker-library/docker-buildpack-deps@a201b127ddf29f47738a9fd04b2f004eb41b009f wheezy
+jessie: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad jessie
+latest: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad jessie
+
+sid-micro: git://github.com/docker-library/docker-buildpack-deps@85e5b77764d78210e55facade71577ae5fc91136 sid/micro
+
+sid: git://github.com/docker-library/docker-buildpack-deps@85e5b77764d78210e55facade71577ae5fc91136 sid
+
+wheezy-micro: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad wheezy/micro
+
+wheezy: git://github.com/docker-library/docker-buildpack-deps@fc4bb937881466a88e408f660ce4d8ad18c11bad wheezy
diff --git a/library/centos b/library/centos
index 15a7e29c69b46..93899da14dda7 100644
--- a/library/centos
+++ b/library/centos
@@ -1,6 +1,28 @@
 # maintainer: The CentOS Project <cloud-ops@centos.org> (@CentOS)
-# Build date 20140926_1219
-latest: git://github.com/CentOS/sig-cloud-instance-images@b28be06c817337e83103afa179965ac47dcc5e7c docker
-centos7: git://github.com/CentOS/sig-cloud-instance-images@b28be06c817337e83103afa179965ac47dcc5e7c docker
-centos6: git://github.com/CentOS/sig-cloud-instance-images@d22f4c466eeba45c1593b5d13d8636ff23bdf062 docker
-centos5: git://github.com/CentOS/sig-cloud-instance-images@f8d27d6f2581846042f303cf5a318f42588d515d docker
+# Build date 20150102_1408
+
+# CentOS 7 rolling builds
+latest: git://github.com/CentOS/sig-cloud-instance-images@c7bfde2d0e3ed621ecfbf02aae7b50d4c912b0f1 docker
+centos7: git://github.com/CentOS/sig-cloud-instance-images@c7bfde2d0e3ed621ecfbf02aae7b50d4c912b0f1 docker
+7: git://github.com/CentOS/sig-cloud-instance-images@c7bfde2d0e3ed621ecfbf02aae7b50d4c912b0f1 docker
+
+# CentOS 6 rolling builds
+centos6: git://github.com/CentOS/sig-cloud-instance-images@684a5ab43827c8316810e5d2abe6ce60e2d68e6e docker
+6: git://github.com/CentOS/sig-cloud-instance-images@684a5ab43827c8316810e5d2abe6ce60e2d68e6e docker
+
+# CentOS 5 rolling builds
+centos5: git://github.com/CentOS/sig-cloud-instance-images@b0178df16b85ccebaa1bcdbb0aa447f67a2df632 docker
+5: git://github.com/CentOS/sig-cloud-instance-images@b0178df16b85ccebaa1bcdbb0aa447f67a2df632 docker
+
+## Minor tagged builds
+#7.0.1406
+centos7.0.1406: git://github.com/CentOS/sig-cloud-instance-images@30aa31e885e3378203d40e50cfd146b160b589dc docker
+7.0.1406: git://github.com/CentOS/sig-cloud-instance-images@30aa31e885e3378203d40e50cfd146b160b589dc docker
+
+# 6.6
+centos6.6: git://github.com/CentOS/sig-cloud-instance-images@72a13cc9b85c6c500531d5f1e1dd86b8308a1cda docker
+6.6: git://github.com/CentOS/sig-cloud-instance-images@72a13cc9b85c6c500531d5f1e1dd86b8308a1cda docker
+
+# 5.11
+centos5.11: git://github.com/CentOS/sig-cloud-instance-images@e0f32850b2893baaa25efa9d98585f4c92aa83fb docker
+5.11: git://github.com/CentOS/sig-cloud-instance-images@e0f32850b2893baaa25efa9d98585f4c92aa83fb docker
diff --git a/library/crate b/library/crate
index 308de75cdab7a..3270b71c69d04 100644
--- a/library/crate
+++ b/library/crate
@@ -2,8 +2,8 @@
 
 # see also https://crate.io
 
-latest: git://github.com/crate/docker-crate@0.45.2
+latest: git://github.com/crate/docker-crate@0.45.6
 0.44: git://github.com/crate/docker-crate@0.44.8
 0.44.8: git://github.com/crate/docker-crate@0.44.8
-0.45: git://github.com/crate/docker-crate@0.45.2
-0.45.2: git://github.com/crate/docker-crate@0.45.2
+0.45: git://github.com/crate/docker-crate@0.45.6
+0.45.6: git://github.com/crate/docker-crate@0.45.6
diff --git a/library/debian b/library/debian
index 0c56c030a9a2e..65e798c27cda2 100644
--- a/library/debian
+++ b/library/debian
@@ -1,29 +1,31 @@
 # maintainer: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
 # commits: (master..dist)
-#  - 94324b3 2014-11-05 debootstraps
+#  - e4d0c60 2015-01-16 debootstraps
 
-jessie: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 jessie
+8.0: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e jessie
+8: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e jessie
+jessie: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e jessie
 
-oldstable: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 oldstable
+oldstable: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e oldstable
 
-sid: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 sid
+sid: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e sid
 
-6.0.10: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 squeeze
-6.0: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 squeeze
-6: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 squeeze
-squeeze: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 squeeze
+6.0.10: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e squeeze
+6.0: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e squeeze
+6: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e squeeze
+squeeze: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e squeeze
 
-stable: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 stable
+stable: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e stable
 
-testing: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 testing
+testing: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e testing
 
-unstable: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 unstable
+unstable: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e unstable
 
-7.7: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 wheezy
-7: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 wheezy
-wheezy: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 wheezy
-latest: git://github.com/tianon/docker-brew-debian@94324b3f6941631db52b94cf7f4097fc239e8e68 wheezy
+7.8: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e wheezy
+7: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e wheezy
+wheezy: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e wheezy
+latest: git://github.com/tianon/docker-brew-debian@e4d0c608272bb00e25576fadda837d6d0380c13e wheezy
 
-rc-buggy: git://github.com/tianon/dockerfiles@d6d435479900274e105bdfdf2792c26c989f05f6 debian/rc-buggy
-experimental: git://github.com/tianon/dockerfiles@d6d435479900274e105bdfdf2792c26c989f05f6 debian/experimental
+rc-buggy: git://github.com/tianon/dockerfiles@ec9497f2742ff8def990c10d214194de145b9319 debian/rc-buggy
+experimental: git://github.com/tianon/dockerfiles@ec9497f2742ff8def990c10d214194de145b9319 debian/experimental
diff --git a/library/django b/library/django
new file mode 100644
index 0000000000000..d00bb191575ba
--- /dev/null
+++ b/library/django
@@ -0,0 +1,20 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+1.7.2-python2: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 2.7
+1.7-python2: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 2.7
+1-python2: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 2.7
+python2: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 2.7
+
+python2-onbuild: git://github.com/docker-library/django@e9721656ef7a246e6edb95b401d324dd2c6e310a 2.7/onbuild
+
+1.7.2-python3: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+1.7.2: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+1.7-python3: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+1.7: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+1-python3: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+1: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+python3: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+latest: git://github.com/docker-library/django@b09fdb43e17d5ffd1e611dcbead7f5f88453fc02 3.4
+
+python3-onbuild: git://github.com/docker-library/django@e9721656ef7a246e6edb95b401d324dd2c6e310a 3.4/onbuild
+onbuild: git://github.com/docker-library/django@e9721656ef7a246e6edb95b401d324dd2c6e310a 3.4/onbuild
diff --git a/library/docker-dev b/library/docker-dev
index a69e701bf41a0..57abb4766fa8d 100644
--- a/library/docker-dev
+++ b/library/docker-dev
@@ -1,10 +1,8 @@
 # maintainer: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
-latest: git://github.com/docker/docker@v1.2.0
-v1.2.0: git://github.com/docker/docker@v1.2.0
-v1.2:   git://github.com/docker/docker@v1.2.0
+1.4.1: git://github.com/docker/docker@v1.4.1
+1.4: git://github.com/docker/docker@v1.4.1
+1: git://github.com/docker/docker@v1.4.1
+latest: git://github.com/docker/docker@v1.4.1
 
-v1.0.1: git://github.com/docker/docker@v1.0.1
-v1.0:   git://github.com/docker/docker@v1.0.1
-
-# "supported": one tag per major, only upstream-supported majors
+# "supported": one tag per major, only upstream-supported majors (which is currently only "latest")
diff --git a/library/fedora b/library/fedora
index 16079fa744bfa..be25d2394a867 100644
--- a/library/fedora
+++ b/library/fedora
@@ -1,7 +1,7 @@
 # maintainer: Lokesh Mandvekar <lsm5@fedoraproject.org> (@lsm5)
 
-latest: git://github.com/lsm5/docker-brew-fedora@f0e71344fcf117e2c2ea8e6aadd7ef16112835f9
-20: git://github.com/lsm5/docker-brew-fedora@f0e71344fcf117e2c2ea8e6aadd7ef16112835f9
-heisenbug: git://github.com/lsm5/docker-brew-fedora@f0e71344fcf117e2c2ea8e6aadd7ef16112835f9
-21: git://github.com/lsm5/docker-brew-fedora@897d815f95a4c31d839050b73bf6e87ae1647848
-rawhide: git://github.com/lsm5/docker-brew-fedora@c713b5ab5373e80f8e2cecc52390ff7328922417
+latest: git://github.com/fedora-cloud/docker-brew-fedora@b252b53a976a0e908805d59fb7250e8d5072f4e8
+21: git://github.com/fedora-cloud/docker-brew-fedora@b252b53a976a0e908805d59fb7250e8d5072f4e8
+rawhide: git://github.com/fedora-cloud/docker-brew-fedora@8b025821f5bc795f9af6023be0e96b5b227a756a
+20: git://github.com/fedora-cloud/docker-brew-fedora@58a9aeac899b94e6ea1b1cbe6853b9b134c7ebc5
+heisenbug: git://github.com/fedora-cloud/docker-brew-fedora@58a9aeac899b94e6ea1b1cbe6853b9b134c7ebc5
diff --git a/library/gcc b/library/gcc
index c84cebc556c3c..7ba997fdef5ee 100644
--- a/library/gcc
+++ b/library/gcc
@@ -1,14 +1,14 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-4.6.4: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.6
-4.6: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.6
+4.6.4: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.6
+4.6: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.6
 
-4.7.4: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.7
-4.7: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.7
+4.7.4: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.7
+4.7: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.7
 
-4.8.3: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.8
-4.8: git://github.com/docker-library/gcc@ba6f069df8e6c838d0465b09215e96f8d5d65269 4.8
+4.8.4: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.8
+4.8: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.8
 
-4.9.2: git://github.com/docker-library/gcc@af77dacbf20f2346a98978d0102db0da0670ea76 4.9
-4.9: git://github.com/docker-library/gcc@af77dacbf20f2346a98978d0102db0da0670ea76 4.9
-latest: git://github.com/docker-library/gcc@af77dacbf20f2346a98978d0102db0da0670ea76 4.9
+4.9.2: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.9
+4.9: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.9
+latest: git://github.com/docker-library/gcc@0d76d76561f3e8581576f9ccc71079e3455a0bea 4.9
diff --git a/library/golang b/library/golang
index 5bde5990d46c6..c18b586dffdc5 100644
--- a/library/golang
+++ b/library/golang
@@ -1,31 +1,34 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 # maintainer: Johan Euphrosine <proppy@google.com> (@proppy)
 
-1.2.2: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.2
-1.2: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.2
+1.3.3: git://github.com/docker-library/golang@b13bdad8632705cd56f887ffe7320076b1b56754 1.3
+1.3: git://github.com/docker-library/golang@b13bdad8632705cd56f887ffe7320076b1b56754 1.3
 
-1.2.2-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.2/onbuild
-1.2-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.2/onbuild
+1.3.3-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
+1.3-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
 
-1.2.2-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.2/cross
-1.2-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.2/cross
+1.3.3-cross: git://github.com/docker-library/golang@acc4ed5ba8dfad17bd484ac858950bc6a6f9acde 1.3/cross
+1.3-cross: git://github.com/docker-library/golang@acc4ed5ba8dfad17bd484ac858950bc6a6f9acde 1.3/cross
 
-1.3.3: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3
-1.3: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3
-1: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3
-latest: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3
+1.3.3-wheezy: git://github.com/docker-library/golang@b13bdad8632705cd56f887ffe7320076b1b56754 1.3/wheezy
+1.3-wheezy: git://github.com/docker-library/golang@b13bdad8632705cd56f887ffe7320076b1b56754 1.3/wheezy
 
-1.3.3-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
-1.3-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
-1-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
-onbuild: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/onbuild
-
-1.3.3-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/cross
-1.3-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/cross
-1-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/cross
-cross: git://github.com/docker-library/golang@4d4b14164e50c089a09b9364697749dc7f764824 1.3/cross
-
-1.3.3-wheezy: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3/wheezy
-1.3-wheezy: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3/wheezy
-1-wheezy: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3/wheezy
-wheezy: git://github.com/docker-library/golang@af4e450a47a99f9a4f56225cdf598f552907d946 1.3/wheezy
+1.4.1: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4
+1.4: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4
+1: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4
+latest: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4
+
+1.4.1-onbuild: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/onbuild
+1.4-onbuild: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/onbuild
+1-onbuild: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/onbuild
+onbuild: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/onbuild
+
+1.4.1-cross: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/cross
+1.4-cross: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/cross
+1-cross: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/cross
+cross: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/cross
+
+1.4.1-wheezy: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/wheezy
+1.4-wheezy: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/wheezy
+1-wheezy: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/wheezy
+wheezy: git://github.com/docker-library/golang@c1baf037d71331eb0b8d4c70cff4c29cf124c5e0 1.4/wheezy
diff --git a/library/haproxy b/library/haproxy
new file mode 100644
index 0000000000000..1e9560078b26c
--- /dev/null
+++ b/library/haproxy
@@ -0,0 +1,9 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+1.4.25: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.4
+1.4: git://github.com/docker-library/haproxy@40cd6587e7da3d247ab2e9fede5021f30a1e773e 1.4
+
+1.5.10: git://github.com/docker-library/haproxy@424fd7e5b610dcea31ffb0f945c2a0da3b6740d3 1.5
+1.5: git://github.com/docker-library/haproxy@424fd7e5b610dcea31ffb0f945c2a0da3b6740d3 1.5
+1: git://github.com/docker-library/haproxy@424fd7e5b610dcea31ffb0f945c2a0da3b6740d3 1.5
+latest: git://github.com/docker-library/haproxy@424fd7e5b610dcea31ffb0f945c2a0da3b6740d3 1.5
diff --git a/library/httpd b/library/httpd
index f46251af29c35..ed7e1cfb19c82 100644
--- a/library/httpd
+++ b/library/httpd
@@ -1,9 +1,9 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-2.2.29: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.2
-2.2: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.2
+2.2.29: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.2
+2.2: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.2
 
-2.4.10: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.4
-2.4: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.4
-2: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.4
-latest: git://github.com/docker-library/httpd@79fef78cd5440f55d181cfb5a9ababbc0c01ce4a 2.4
+2.4.10: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.4
+2.4: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.4
+2: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.4
+latest: git://github.com/docker-library/httpd@047048112cb4f8997b1a51f4295f44584b436a83 2.4
diff --git a/library/java b/library/java
index ef48d425a0668..ee94d6f1bd981 100644
--- a/library/java
+++ b/library/java
@@ -1,52 +1,52 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-openjdk-6b32-jdk: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-openjdk-6b32: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-openjdk-6-jdk: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-openjdk-6: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-6b32-jdk: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-6b32: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-6-jdk: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
-6: git://github.com/docker-library/java@9b3b7ed1bdd754fa61b5dd86c0bcd3e3400c6a33 openjdk-6-jdk
+openjdk-6b33-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+openjdk-6b33: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+openjdk-6-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+openjdk-6: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+6b33-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+6b33: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+6-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
+6: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jdk
 
-openjdk-6b32-jre: git://github.com/docker-library/java@d2acc0356b5a68a4d168462a3f5f0e29444982b9 openjdk-6-jre
-openjdk-6-jre: git://github.com/docker-library/java@d2acc0356b5a68a4d168462a3f5f0e29444982b9 openjdk-6-jre
-6b32-jre: git://github.com/docker-library/java@d2acc0356b5a68a4d168462a3f5f0e29444982b9 openjdk-6-jre
-6-jre: git://github.com/docker-library/java@d2acc0356b5a68a4d168462a3f5f0e29444982b9 openjdk-6-jre
+openjdk-6b33-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jre
+openjdk-6-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jre
+6b33-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jre
+6-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-6-jre
 
-openjdk-7u71-jdk: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-openjdk-7u71: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-openjdk-7-jdk: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-openjdk-7: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-7u71-jdk: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-7u71: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-7-jdk: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-7: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-jdk: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
-latest: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jdk
+openjdk-7u71-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+openjdk-7u71: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+openjdk-7-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+openjdk-7: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+7u71-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+7u71: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+7-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+7: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
+latest: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jdk
 
-openjdk-7u71-jre: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jre
-openjdk-7-jre: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jre
-7u71-jre: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jre
-7-jre: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jre
-jre: git://github.com/docker-library/java@4ab314dc41cb31313f630ce5e11398ef0f9e9ae9 openjdk-7-jre
+openjdk-7u71-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jre
+openjdk-7-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jre
+7u71-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jre
+7-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jre
+jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-7-jre
 
-openjdk-8u40-b09-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-openjdk-8u40-b09: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-openjdk-8u40-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-openjdk-8u40: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-openjdk-8-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-openjdk-8: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8u40-b09-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8u40-b09: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8u40-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8u40: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8-jdk: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
-8: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jdk
+openjdk-8u40-b09-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+openjdk-8u40-b09: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+openjdk-8u40-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+openjdk-8u40: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+openjdk-8-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+openjdk-8: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8u40-b09-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8u40-b09: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8u40-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8u40: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8-jdk: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
+8: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jdk
 
-openjdk-8u40-b09-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
-openjdk-8u40-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
-openjdk-8-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
-8u40-b09-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
-8u40-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
-8-jre: git://github.com/docker-library/java@1b4378dc7b57c8534fe715cfcec356ee96c87e92 openjdk-8-jre
+openjdk-8u40-b09-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
+openjdk-8u40-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
+openjdk-8-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
+8u40-b09-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
+8u40-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
+8-jre: git://github.com/docker-library/java@0b124de91ebd32bcc8977fd2214d36b8fccb615c openjdk-8-jre
diff --git a/library/jenkins b/library/jenkins
index 4aa2c873ced16..672b763f49f49 100644
--- a/library/jenkins
+++ b/library/jenkins
@@ -1,31 +1,55 @@
+# maintainer: Nicolas De Loof <nicolas.deloof@gmail.com> (@ndeloof)
 # maintainer: Michael Neale <mneale@cloudbees.com> (@michaelneale)
-# maintainer: Nicolas De Loof <ndeloof@cloudbees.com> (@ndeloof)
-
-# "latest" is latest _stable_, i.e. latest LTS release
-latest: git://github.com/cloudbees/jenkins-ci.org-docker@f744bdb73fbfc701a52105460511284a470bcfb8
-1.565.3: git://github.com/cloudbees/jenkins-ci.org-docker@f744bdb73fbfc701a52105460511284a470bcfb8
-
-# weekly releases
-weekly: git://github.com/cloudbees/jenkins-ci.org-docker@f4fff43208976e7c1b01e422512522d48338267a
-1.585: git://github.com/cloudbees/jenkins-ci.org-docker@f4fff43208976e7c1b01e422512522d48338267a
-1.584: git://github.com/cloudbees/jenkins-ci.org-docker@1d0405229b5f25ff52b5930a56488470ce386efc
-1.583: git://github.com/cloudbees/jenkins-ci.org-docker@f969422940ce4b2cd0bbbdcf31ea96fa2485e86c
-1.582: git://github.com/cloudbees/jenkins-ci.org-docker@f342846daeba66dbc45e72ecf667f518c293748c
-1.581: git://github.com/cloudbees/jenkins-ci.org-docker@f8177e96558128263f45da84b1beaa469f7bfc21
-1.580: git://github.com/cloudbees/jenkins-ci.org-docker@55f2b10a012a1a313ebec27af0caa0798ec12c31
-1.579: git://github.com/cloudbees/jenkins-ci.org-docker@56c328d7de415529a232b47f4afa4a86c2a0cda2
-1.578: git://github.com/cloudbees/jenkins-ci.org-docker@86f205928fc5ab5dd90c7baec959695d058bc010
-1.577: git://github.com/cloudbees/jenkins-ci.org-docker@055e3fff7a74b991e7bf3e3216a9837aa6940cc9
-1.576: git://github.com/cloudbees/jenkins-ci.org-docker@9fab53eaeb23a8e38397e2e5277d85308c4eebb2
-1.575: git://github.com/cloudbees/jenkins-ci.org-docker@f9874a62b3e407f70fdb6b1e4abfbc19524167e8
-1.574: git://github.com/cloudbees/jenkins-ci.org-docker@6593de9b616bb76bc0e5db4d8a2bf6621d70cbb5
-1.573: git://github.com/cloudbees/jenkins-ci.org-docker@fa91e79b782a0a90506522f9436217ed57ee69c2
-1.572: git://github.com/cloudbees/jenkins-ci.org-docker@3ca321364b65f8235155f29e55285310a92d4349
-1.571: git://github.com/cloudbees/jenkins-ci.org-docker@200404a9ba52b92aea51147753bcd12d6ecf307c
-1.570: git://github.com/cloudbees/jenkins-ci.org-docker@8c3ca50ca8cdbaede4e1bb63d5933664f0786681
-1.569: git://github.com/cloudbees/jenkins-ci.org-docker@f9f43966ce0cf1191cb1ac4daaf235f780d0614b
-1.568: git://github.com/cloudbees/jenkins-ci.org-docker@99088cfac0d9d1e0b93f4dfa46d573c24f985550
-1.567: git://github.com/cloudbees/jenkins-ci.org-docker@f76347f922c3d4c5c8406a27c7f25e8dd2a9f34d
-1.566: git://github.com/cloudbees/jenkins-ci.org-docker@a8b41cd62974f2ca869b0b1cf33d6e616335a769
-1.565: git://github.com/cloudbees/jenkins-ci.org-docker@8a208c0f226f7b057acaf43cc7c8d1f4021a4f84
 
+1.554.1: git://github.com/cloudbees/jenkins-ci.org-docker@f313389f8ab728d7b4207da36804ea54415c830b 1.554.1
+1.554.2: git://github.com/cloudbees/jenkins-ci.org-docker@f313389f8ab728d7b4207da36804ea54415c830b 1.554.2
+1.554.3: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.554.3
+1.555: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.555
+1.556: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.556
+1.557: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.557
+1.558: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.558
+1.559: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.559
+1.560: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.560
+1.561: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.561
+1.562: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.562
+1.563: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.563
+1.564: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.564
+1.565.1: git://github.com/cloudbees/jenkins-ci.org-docker@f313389f8ab728d7b4207da36804ea54415c830b 1.565.1
+1.565.2: git://github.com/cloudbees/jenkins-ci.org-docker@f313389f8ab728d7b4207da36804ea54415c830b 1.565.2
+1.565.3: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.565.3
+1.565: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.565
+1.566: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.566
+1.567: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.567
+1.568: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.568
+1.569: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.569
+1.570: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.570
+1.571: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.571
+1.572: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.572
+1.573: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.573
+1.574: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.574
+1.575: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.575
+1.576: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.576
+1.577: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.577
+1.578: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.578
+1.579: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.579
+1.580.1: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.580.1
+1.580.2: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.580.2
+latest: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.580.2
+1.580: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.580
+1.581: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.581
+1.582: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.582
+1.583: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.583
+1.584: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.584
+1.585: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.585
+1.586: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.586
+1.587: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.587
+1.588: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.588
+1.589: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.589
+1.590: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.590
+1.591: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.591
+1.592: git://github.com/cloudbees/jenkins-ci.org-docker@40c3e3f46939b9f9dcf8d46e62fa7daa80485588 1.592
+1.593: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.593
+1.594: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.594
+1.595: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.595
+1.596: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.596
+weekly: git://github.com/cloudbees/jenkins-ci.org-docker@c39540d22e2a9c20e691cbdc4c9c54aee77be357 1.596
diff --git a/library/jruby b/library/jruby
index 5bb56b2c04847..2529275bf784e 100644
--- a/library/jruby
+++ b/library/jruby
@@ -1,11 +1,9 @@
 # maintainer: Brian Goff <cpuguy83@gmail.com> (@cpuguy83)
 
-1.7: git://github.com/cpuguy83/docker-jruby@fe814254b51c4f619ec2561df421259c32b27c63 1.7
-1.7.16: git://github.com/cpuguy83/docker-jruby@fe814254b51c4f619ec2561df421259c32b27c63 1.7
-1.7.16.1: git://github.com/cpuguy83/docker-jruby@fe814254b51c4f619ec2561df421259c32b27c63 1.7
-latest: git://github.com/cpuguy83/docker-jruby@fe814254b51c4f619ec2561df421259c32b27c63 1.7
+1.7: git://github.com/cpuguy83/docker-jruby@e7af3d9a85d166f3dd4b600a629908bd05639fb5 1.7
+1.7.18: git://github.com/cpuguy83/docker-jruby@e7af3d9a85d166f3dd4b600a629908bd05639fb5 1.7
+latest: git://github.com/cpuguy83/docker-jruby@e7af3d9a85d166f3dd4b600a629908bd05639fb5 1.7
 
-dev: git://github.com/cpuguy83/docker-jruby@384671d2c1b26465a38c6f9e645024b3ab217bad 9000
+1.7-onbuild: git://github.com/cpuguy83/docker-jruby@e7af3d9a85d166f3dd4b600a629908bd05639fb5 1.7/onbuild
+1.7.18-onbuild: git://github.com/cpuguy83/docker-jruby@e7af3d9a85d166f3dd4b600a629908bd05639fb5 1.7/onbuild
 
-1.7-onbuild: git://github.com/cpuguy83/docker-jruby@10eae9359611104c013e82206104b40f20fac377 1.7/onbuild
-1.7.16-onbuild: git://github.com/cpuguy83/docker-jruby@10eae9359611104c013e82206104b40f20fac377 1.7/onbuild
diff --git a/library/mariadb b/library/mariadb
new file mode 100644
index 0000000000000..d9e442948ad6c
--- /dev/null
+++ b/library/mariadb
@@ -0,0 +1,13 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+10.0.15: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.0
+10.0: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.0
+10: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.0
+latest: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.0
+
+10.1.2: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.1
+10.1: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 10.1
+
+5.5.41: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 5.5
+5.5: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 5.5
+5: git://github.com/docker-library/mariadb@d06c367c4b199f91b36f5f6fabf8305282b8abac 5.5
diff --git a/library/maven b/library/maven
index a1af01a91620d..68526a94b4bd3 100644
--- a/library/maven
+++ b/library/maven
@@ -1,37 +1,33 @@
-# maintainer: Carlos Sanchez <github@carlossanchez.eu> (@carlossg)
+# maintainer: Carlos Sanchez <carlos@apache.org> (@carlossg)
 
-#3.2.3-jdk-6b32: git://github.com/carlossg/docker-maven@2f22e2b jdk-6
-#3.2.3-jdk-6: git://github.com/carlossg/docker-maven@2f22e2b jdk-6
-3.2-jdk-6: git://github.com/carlossg/docker-maven@2f22e2b jdk-6
-3-jdk-6: git://github.com/carlossg/docker-maven@2f22e2b jdk-6
+3.2.5-jdk-6: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-6
+3.2-jdk-6: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-6
+3-jdk-6: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-6
 
-#3.2.3-jdk-6b32-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-6/onbuild
-#3.2.3-jdk-6-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-6/onbuild
-3.2-jdk-6-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-6/onbuild
-3-jdk-6-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-6/onbuild
+3.2.5-jdk-6-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-6/onbuild
+3.2-jdk-6-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-6/onbuild
+3-jdk-6-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-6/onbuild
 
-#3.2.3-jdk-7u65: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-#3.2.3-jdk-7: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-3.2-jdk-7: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-3-jdk-7: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-3.2: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-3: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
-latest: git://github.com/carlossg/docker-maven@2f22e2b jdk-7
+3.2.5-jdk-7: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+3.2.5: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+3.2-jdk-7: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+3.2: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+3-jdk-7: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+3: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
+latest: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-7
 
-#3.2.3-jdk-7u65-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-#3.2.3-jdk-7-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-3.2-jdk-7-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-3-jdk-7-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-3.2-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-3-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
-latest-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-7/onbuild
+3.2.5-jdk-7-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+3.2.5-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+3.2-jdk-7-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+3.2-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+3-jdk-7-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+3-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
+onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-7/onbuild
 
-#3.2.3-jdk-8u40: git://github.com/carlossg/docker-maven@2f22e2b jdk-8
-#3.2.3-jdk-8: git://github.com/carlossg/docker-maven@2f22e2b jdk-8
-3.2-jdk-8: git://github.com/carlossg/docker-maven@2f22e2b jdk-8
-3-jdk-8: git://github.com/carlossg/docker-maven@2f22e2b jdk-8
+3.2.5-jdk-8: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-8
+3.2-jdk-8: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-8
+3-jdk-8: git://github.com/carlossg/docker-maven@84b934b2349c83b4ebda7f668b71ba53e60e9c83 jdk-8
 
-#3.2.3-jdk-8u40-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-8/onbuild
-#3.2.3-jdk-8-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-8/onbuild
-3.2-jdk-8-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-8/onbuild
-3-jdk-8-onbuild: git://github.com/carlossg/docker-maven@2f22e2b jdk-8/onbuild
+3.2.5-jdk-8-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-8/onbuild
+3.2-jdk-8-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-8/onbuild
+3-jdk-8-onbuild: git://github.com/carlossg/docker-maven@b022df671b603a9100ed9e75803ae32f753826a4 jdk-8/onbuild
\ No newline at end of file
diff --git a/library/memcached b/library/memcached
new file mode 100644
index 0000000000000..56eb94196f1b4
--- /dev/null
+++ b/library/memcached
@@ -0,0 +1,6 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+1.4.22: git://github.com/docker-library/memcached@5fb6459a1eb138dcd9cfcd5fa1aef62ee511d335
+1.4: git://github.com/docker-library/memcached@5fb6459a1eb138dcd9cfcd5fa1aef62ee511d335
+1: git://github.com/docker-library/memcached@5fb6459a1eb138dcd9cfcd5fa1aef62ee511d335
+latest: git://github.com/docker-library/memcached@5fb6459a1eb138dcd9cfcd5fa1aef62ee511d335
diff --git a/library/mongo b/library/mongo
index 9d28d7f266596..a4c3b1358a33e 100644
--- a/library/mongo
+++ b/library/mongo
@@ -1,15 +1,16 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-2.2.7: git://github.com/docker-library/mongo@2881be3e0d85b3600bda8d45050a2ceb3f7bb12b 2.2
-2.2: git://github.com/docker-library/mongo@2881be3e0d85b3600bda8d45050a2ceb3f7bb12b 2.2
+2.2.7: git://github.com/docker-library/mongo@d9fb48dbdb0b9c35d35902429fe1a28527959f25 2.2
+2.2: git://github.com/docker-library/mongo@d9fb48dbdb0b9c35d35902429fe1a28527959f25 2.2
 
-2.4.12: git://github.com/docker-library/mongo@6fcf234e0bd9b50cfbac267ccb451cb8500c8dfc 2.4
-2.4: git://github.com/docker-library/mongo@6fcf234e0bd9b50cfbac267ccb451cb8500c8dfc 2.4
+2.4.12: git://github.com/docker-library/mongo@d9fb48dbdb0b9c35d35902429fe1a28527959f25 2.4
+2.4: git://github.com/docker-library/mongo@d9fb48dbdb0b9c35d35902429fe1a28527959f25 2.4
 
-2.6.5: git://github.com/docker-library/mongo@bebabb72a2785d7b78309bf6be6c82bab882574b 2.6
-2.6: git://github.com/docker-library/mongo@bebabb72a2785d7b78309bf6be6c82bab882574b 2.6
-2: git://github.com/docker-library/mongo@bebabb72a2785d7b78309bf6be6c82bab882574b 2.6
-latest: git://github.com/docker-library/mongo@bebabb72a2785d7b78309bf6be6c82bab882574b 2.6
+2.6.7: git://github.com/docker-library/mongo@1d641659a75cf2f8ce1b517c7fc2a0ebfd033eed 2.6
+2.6: git://github.com/docker-library/mongo@1d641659a75cf2f8ce1b517c7fc2a0ebfd033eed 2.6
+2: git://github.com/docker-library/mongo@1d641659a75cf2f8ce1b517c7fc2a0ebfd033eed 2.6
+latest: git://github.com/docker-library/mongo@1d641659a75cf2f8ce1b517c7fc2a0ebfd033eed 2.6
 
-2.7.8: git://github.com/docker-library/mongo@9c3312e0f6cc6118bab840105ce701067a84feff 2.7
-2.7: git://github.com/docker-library/mongo@9c3312e0f6cc6118bab840105ce701067a84feff 2.7
+2.8.0-rc5: git://github.com/docker-library/mongo@fc66d9cbedac47806c7ae05b1b291c4ee32f6e6a 2.8
+2.8.0: git://github.com/docker-library/mongo@fc66d9cbedac47806c7ae05b1b291c4ee32f6e6a 2.8
+2.8: git://github.com/docker-library/mongo@fc66d9cbedac47806c7ae05b1b291c4ee32f6e6a 2.8
diff --git a/library/mono b/library/mono
index 3c21b517ea47d..581994364a109 100644
--- a/library/mono
+++ b/library/mono
@@ -1,16 +1,23 @@
 # maintainer: Jo Shields <jo.shields@xamarin.com> (@directhex)
 
-3.10.0: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0
-3.10: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0
+3.10.0: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.10.0
+3.10: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.10.0
 
-3.10.0-onbuild: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0/onbuild
-3.10-onbuild: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0/onbuild
+3.10.0-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.10.0/onbuild
+3.10-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.10.0/onbuild
 
-3.8.0: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.8.0
-3.8: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.8.0
+3.12.0: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.12.0
+3.12: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.12.0
+3: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.12.0
+latest: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.12.0
 
-3.8.0-onbuild: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.8.0/onbuild
-3.8-onbuild: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.8.0/onbuild
+3.12.0-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.12.0/onbuild
+3.12-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.12.0/onbuild
+3-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.12.0/onbuild
+onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.12.0/onbuild
 
-latest: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0
-onbuild: git://github.com/mono/docker@96aca22c58df59c08d345cbe8af79c11b43c5f1f 3.10.0/onbuild
+3.8.0: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.8.0
+3.8: git://github.com/mono/docker@2d7f8f39a10ab9fda43b33ba17f6985d1b2cd3d8 3.8.0
+
+3.8.0-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.8.0/onbuild
+3.8-onbuild: git://github.com/mono/docker@66226b17125b72685c2022e4fecaee2716b0fb3a 3.8.0/onbuild
diff --git a/library/mysql b/library/mysql
index 73eec3e436d98..6bd11b8a250a0 100644
--- a/library/mysql
+++ b/library/mysql
@@ -1,13 +1,13 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-5.5.40: git://github.com/docker-library/docker-mysql@19a90daaa8d95e388a0b0953623c0fbdb7e7640c 5.5
-5.5: git://github.com/docker-library/docker-mysql@19a90daaa8d95e388a0b0953623c0fbdb7e7640c 5.5
+5.5.41: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.5
+5.5: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.5
 
-5.6.21: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.6
-5.6: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.6
-5: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.6
-latest: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.6
+5.6.22: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.6
+5.6: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.6
+5: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.6
+latest: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.6
 
-5.7.5-m15: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.7
-5.7.5: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.7
-5.7: git://github.com/docker-library/docker-mysql@8abf4685a211529d8e5bd08f7b58502f5c84b439 5.7
+5.7.5-m15: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.7
+5.7.5: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.7
+5.7: git://github.com/docker-library/docker-mysql@567028d4e177238c58760bcd69a8766a8f026e2a 5.7
diff --git a/library/nginx b/library/nginx
index 6af6a98df7c93..e36cd9cf747eb 100644
--- a/library/nginx
+++ b/library/nginx
@@ -1,6 +1,6 @@
 # maintainer: NGINX Docker Maintainers <docker-maint@nginx.com> (@nginxinc)
 
-latest: git://github.com/nginxinc/docker-nginx@66d3b5a0ece894c213c16af5753bc52be9ebb1e6
-1: git://github.com/nginxinc/docker-nginx@66d3b5a0ece894c213c16af5753bc52be9ebb1e6
-1.7: git://github.com/nginxinc/docker-nginx@66d3b5a0ece894c213c16af5753bc52be9ebb1e6
-1.7.7: git://github.com/nginxinc/docker-nginx@66d3b5a0ece894c213c16af5753bc52be9ebb1e6
+latest: git://github.com/nginxinc/docker-nginx@57da11369acbec3256b0c2704a50282eeabb684f
+1: git://github.com/nginxinc/docker-nginx@57da11369acbec3256b0c2704a50282eeabb684f
+1.7: git://github.com/nginxinc/docker-nginx@57da11369acbec3256b0c2704a50282eeabb684f
+1.7.9: git://github.com/nginxinc/docker-nginx@57da11369acbec3256b0c2704a50282eeabb684f
diff --git a/library/node b/library/node
index 37d0137b5f4d9..15e9f99378b0e 100644
--- a/library/node
+++ b/library/node
@@ -1,34 +1,34 @@
-# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+# maintainer: Joyent Image Team <image-team@joyent.com> (@joyent)
 
-0.10.33: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10
-0.10: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10
-0: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10
-latest: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10
+0.10.35: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10
+0.10: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10
+0: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10
+latest: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10
 
-0.10.33-onbuild: git://github.com/docker-library/node@806873187edbff36d7fc294a62131f4f28fa681a 0.10/onbuild
-0.10-onbuild: git://github.com/docker-library/node@806873187edbff36d7fc294a62131f4f28fa681a 0.10/onbuild
-0-onbuild: git://github.com/docker-library/node@806873187edbff36d7fc294a62131f4f28fa681a 0.10/onbuild
-onbuild: git://github.com/docker-library/node@806873187edbff36d7fc294a62131f4f28fa681a 0.10/onbuild
+0.10.35-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/onbuild
+0.10-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/onbuild
+0-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/onbuild
+onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/onbuild
 
-0.10.33-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10/slim
-0.10-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10/slim
-0-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10/slim
-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.10/slim
+0.10.35-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/slim
+0.10-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/slim
+0-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/slim
+slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.10/slim
 
-0.11.14: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.11
-0.11: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.11
+0.11.14: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11
+0.11: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11
 
-0.11.14-onbuild: git://github.com/docker-library/node@ac05e7f96c477223f0d2da1817e84403363a65e8 0.11/onbuild
-0.11-onbuild: git://github.com/docker-library/node@ac05e7f96c477223f0d2da1817e84403363a65e8 0.11/onbuild
+0.11.14-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11/onbuild
+0.11-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11/onbuild
 
-0.11.14-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.11/slim
-0.11-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.11/slim
+0.11.14-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11/slim
+0.11-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.11/slim
 
-0.8.28: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.8
-0.8: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.8
+0.8.28: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8
+0.8: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8
 
-0.8.28-onbuild: git://github.com/docker-library/node@ac05e7f96c477223f0d2da1817e84403363a65e8 0.8/onbuild
-0.8-onbuild: git://github.com/docker-library/node@ac05e7f96c477223f0d2da1817e84403363a65e8 0.8/onbuild
+0.8.28-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8/onbuild
+0.8-onbuild: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8/onbuild
 
-0.8.28-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.8/slim
-0.8-slim: git://github.com/docker-library/node@9078df001cc3de2713050d89bd9ba3c539845c6f 0.8/slim
+0.8.28-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8/slim
+0.8-slim: git://github.com/joyent/docker-node@21e69d768f26da8aade316a573673a2bf5bfeab7 0.8/slim
diff --git a/library/odoo b/library/odoo
new file mode 100644
index 0000000000000..5b901f3d0dae3
--- /dev/null
+++ b/library/odoo
@@ -0,0 +1,5 @@
+# maintainer: Aaron Bohy <aab@odoo.com> (@aab-odoo)
+
+8.0: git://github.com/odoo/docker@3a6e42c7a7698196dd42dc7c4b5782ab50885f89 8.0
+8: git://github.com/odoo/docker@3a6e42c7a7698196dd42dc7c4b5782ab50885f89 8.0
+latest: git://github.com/odoo/docker@3a6e42c7a7698196dd42dc7c4b5782ab50885f89 8.0
diff --git a/library/oraclelinux b/library/oraclelinux
new file mode 100644
index 0000000000000..eeaa5d0d0a948
--- /dev/null
+++ b/library/oraclelinux
@@ -0,0 +1,10 @@
+# maintainer: Oracle Linux Product Team <ol-ovm-info_ww@oracle.com> (@Djelibeybi)
+
+# Oracle Linux 7
+7: git://github.com/oracle/docker-images.git@6657d15b4d2282674a2c8395f1e5c90364a3793b OracleLinux/7.0
+7.0: git://github.com/oracle/docker-images.git@6657d15b4d2282674a2c8395f1e5c90364a3793b OracleLinux/7.0
+latest: git://github.com/oracle/docker-images.git@6657d15b4d2282674a2c8395f1e5c90364a3793b OracleLinux/7.0
+
+# Oracle Linux 6
+6: git://github.com/oracle/docker-images.git@6657d15b4d2282674a2c8395f1e5c90364a3793b OracleLinux/6.6
+6.6: git://github.com/oracle/docker-images.git@6657d15b4d2282674a2c8395f1e5c90364a3793b OracleLinux/6.6
diff --git a/library/perl b/library/perl
index 4e7a24a081c61..b31bf72bd67a0 100644
--- a/library/perl
+++ b/library/perl
@@ -10,7 +10,7 @@ latest:          git://github.com/perl/docker-perl@r20141106.0 5.020.001-64bit
 5.18:            git://github.com/perl/docker-perl@r20141106.0 5.018.004-64bit
 5.18.4:          git://github.com/perl/docker-perl@r20141106.0 5.018.004-64bit
 
-latest-threaded: git://github.com/perl/docker-perl@r20141106.0 5.020.001-64bit,threaded
+threaded:        git://github.com/perl/docker-perl@r20141106.0 5.020.001-64bit,threaded
 
 5-threaded:      git://github.com/perl/docker-perl@r20141106.0 5.020.001-64bit,threaded
 
diff --git a/library/php b/library/php
index 2e1ecb2142ea2..7a407a79781a6 100644
--- a/library/php
+++ b/library/php
@@ -1,31 +1,42 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-5.4.34-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4
-5.4-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4
-5.4.34: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4
-5.4: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4
-
-5.4.34-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4/apache
-5.4-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.4/apache
-
-5.5.18-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5
-5.5-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5
-5.5.18: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5
-5.5: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5
-
-5.5.18-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5/apache
-5.5-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.5/apache
-
-5.6.2-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-5.6-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-5-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-cli: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-5.6.2: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-5.6: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-5: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-latest: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6
-
-5.6.2-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6/apache
-5.6-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6/apache
-5-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6/apache
-apache: git://github.com/docker-library/php@cf2a4bcb5b7044f3db73eef4aa8d8e56e07cdf61 5.6/apache
+5.4.36-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4
+5.4-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4
+5.4.36: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4
+5.4: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4
+
+5.4.36-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4/apache
+5.4-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4/apache
+
+5.4.36-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4/fpm
+5.4-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.4/fpm
+
+5.5.20-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5
+5.5-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5
+5.5.20: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5
+5.5: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5
+
+5.5.20-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5/apache
+5.5-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5/apache
+
+5.5.20-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5/fpm
+5.5-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.5/fpm
+
+5.6.4-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+5.6-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+5-cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+cli: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+5.6.4: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+5.6: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+5: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+latest: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6
+
+5.6.4-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/apache
+5.6-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/apache
+5-apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/apache
+apache: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/apache
+
+5.6.4-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/fpm
+5.6-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/fpm
+5-fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/fpm
+fpm: git://github.com/docker-library/php@5d49ba5861c0245da96132b011c8dbdad8c28188 5.6/fpm
diff --git a/library/postgres b/library/postgres
index 1fd61233d23d1..e621b8a6d88d7 100644
--- a/library/postgres
+++ b/library/postgres
@@ -1,22 +1,22 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-8.4.22: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 8.4
-8.4: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 8.4
-8: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 8.4
+8.4.22: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 8.4
+8.4: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 8.4
+8: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 8.4
 
-9.0.18: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.0
-9.0: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.0
+9.0.18: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.0
+9.0: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.0
 
-9.1.14: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.1
-9.1: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.1
+9.1.14: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.1
+9.1: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.1
 
-9.2.9: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.2
-9.2: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.2
+9.2.9: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.2
+9.2: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.2
 
-9.3.5: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.3
-9.3: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.3
-9: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.3
-latest: git://github.com/docker-library/postgres@4603177ae330d135dea953b42aec28fe1eef514e 9.3
+9.3.5: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.3
+9.3: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.3
 
-9.4-beta3: git://github.com/docker-library/postgres@69a30d9e6f12c57296b11d3511127210466f0197 9.4
-9.4: git://github.com/docker-library/postgres@69a30d9e6f12c57296b11d3511127210466f0197 9.4
+9.4.0: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.4
+9.4: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.4
+9: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.4
+latest: git://github.com/docker-library/postgres@51e5166d69320581cb707d6fb102d3ba04803400 9.4
diff --git a/library/pypy b/library/pypy
new file mode 100644
index 0000000000000..ea1bf8f65a962
--- /dev/null
+++ b/library/pypy
@@ -0,0 +1,34 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+2-2.4.0: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2
+2-2.4: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2
+2-2: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2
+2: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2
+
+2-2.4.0-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2/onbuild
+2-2.4-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2/onbuild
+2-2-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2/onbuild
+2-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 2/onbuild
+
+2-2.4.0-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 2/slim
+2-2.4-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 2/slim
+2-2-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 2/slim
+2-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 2/slim
+
+3-2.4.0: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3
+3-2.4: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3
+3-2: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3
+3: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3
+latest: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3
+
+3-2.4.0-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3/onbuild
+3-2.4-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3/onbuild
+3-2-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3/onbuild
+3-onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3/onbuild
+onbuild: git://github.com/docker-library/pypy@0e9d197376519d7cc4cad52f378b7b289b524bad 3/onbuild
+
+3-2.4.0-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 3/slim
+3-2.4-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 3/slim
+3-2-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 3/slim
+3-slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 3/slim
+slim: git://github.com/docker-library/pypy@b205b0255a3816166e4a91fc28521e25e9875485 3/slim
diff --git a/library/python b/library/python
index 33830b4e5c17c..8d853dfe2ce16 100644
--- a/library/python
+++ b/library/python
@@ -1,25 +1,49 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-2.7.8: git://github.com/docker-library/python@dbe3e241f4c3263a81a888896f5126861807b3db 2.7
-2.7: git://github.com/docker-library/python@dbe3e241f4c3263a81a888896f5126861807b3db 2.7
-2: git://github.com/docker-library/python@dbe3e241f4c3263a81a888896f5126861807b3db 2.7
+2.7.9: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7
+2.7: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7
+2: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7
 
-2.7.8-onbuild: git://github.com/docker-library/python@a30ed3056ee58ca3df4fd5b51e3d30849dcb7e32 2.7/onbuild
-2.7-onbuild: git://github.com/docker-library/python@a30ed3056ee58ca3df4fd5b51e3d30849dcb7e32 2.7/onbuild
-2-onbuild: git://github.com/docker-library/python@a30ed3056ee58ca3df4fd5b51e3d30849dcb7e32 2.7/onbuild
+2.7.9-onbuild: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/onbuild
+2.7-onbuild: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/onbuild
+2-onbuild: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/onbuild
 
-3.3.6: git://github.com/docker-library/python@8dfe392dff2ffdda90672857e027ff3ee142f9ff 3.3
-3.3: git://github.com/docker-library/python@8dfe392dff2ffdda90672857e027ff3ee142f9ff 3.3
+2.7.9-slim: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/slim
+2.7-slim: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/slim
+2-slim: git://github.com/docker-library/python@d550e292eec57e83af58e05410243d387d6483a8 2.7/slim
+
+2.7.9-wheezy: git://github.com/docker-library/python@57be1a3fd72a87419aea35d6aacc873e9de9d447 2.7/wheezy
+2.7-wheezy: git://github.com/docker-library/python@57be1a3fd72a87419aea35d6aacc873e9de9d447 2.7/wheezy
+2-wheezy: git://github.com/docker-library/python@57be1a3fd72a87419aea35d6aacc873e9de9d447 2.7/wheezy
+
+3.3.6: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.3
+3.3: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.3
 
 3.3.6-onbuild: git://github.com/docker-library/python@8dfe392dff2ffdda90672857e027ff3ee142f9ff 3.3/onbuild
 3.3-onbuild: git://github.com/docker-library/python@8dfe392dff2ffdda90672857e027ff3ee142f9ff 3.3/onbuild
 
-3.4.2: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4
-3.4: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4
-3: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4
-latest: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4
+3.3.6-slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.3/slim
+3.3-slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.3/slim
+
+3.3.6-wheezy: git://github.com/docker-library/python@8d45b76631118c99ee2404e8d75916418f5e2fa5 3.3/wheezy
+3.3-wheezy: git://github.com/docker-library/python@8d45b76631118c99ee2404e8d75916418f5e2fa5 3.3/wheezy
+
+3.4.2: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.4
+3.4: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.4
+3: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.4
+latest: git://github.com/docker-library/python@fa713180402eeb7bf782d484c510b6c32418b45f 3.4
 
 3.4.2-onbuild: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4/onbuild
 3.4-onbuild: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4/onbuild
 3-onbuild: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4/onbuild
 onbuild: git://github.com/docker-library/python@e236058d5c3601af1d38ba27b4fe217c5d678c02 3.4/onbuild
+
+3.4.2-slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.4/slim
+3.4-slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.4/slim
+3-slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.4/slim
+slim: git://github.com/docker-library/python@c0c674911c50ca3e21ba5379541f70c1b42685b4 3.4/slim
+
+3.4.2-wheezy: git://github.com/docker-library/python@771697823173d2270f9c2494890dcfa65243877a 3.4/wheezy
+3.4-wheezy: git://github.com/docker-library/python@771697823173d2270f9c2494890dcfa65243877a 3.4/wheezy
+3-wheezy: git://github.com/docker-library/python@771697823173d2270f9c2494890dcfa65243877a 3.4/wheezy
+wheezy: git://github.com/docker-library/python@771697823173d2270f9c2494890dcfa65243877a 3.4/wheezy
diff --git a/library/rabbitmq b/library/rabbitmq
new file mode 100644
index 0000000000000..1139e918d113c
--- /dev/null
+++ b/library/rabbitmq
@@ -0,0 +1,11 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+3.4.3: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752
+3.4: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752
+3: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752
+latest: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752
+
+3.4.3-management: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752 management
+3.4-management: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752 management
+3-management: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752 management
+management: git://github.com/docker-library/rabbitmq@02d383bd9c9919b0c1401a6c9aa06ac790867752 management
diff --git a/library/rails b/library/rails
index 529b90be38882..dc797db5de7ab 100644
--- a/library/rails
+++ b/library/rails
@@ -1,8 +1,8 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-4.1.7: git://github.com/docker-library/rails@90ccf97ef73b253dadd2e4d5466976fbef7de08f
-4.1: git://github.com/docker-library/rails@90ccf97ef73b253dadd2e4d5466976fbef7de08f
-4: git://github.com/docker-library/rails@90ccf97ef73b253dadd2e4d5466976fbef7de08f
-latest: git://github.com/docker-library/rails@90ccf97ef73b253dadd2e4d5466976fbef7de08f
+4.2.0: git://github.com/docker-library/rails@7a7f05408cddabc75ca3c5252097e238021680a8
+4.2: git://github.com/docker-library/rails@7a7f05408cddabc75ca3c5252097e238021680a8
+4: git://github.com/docker-library/rails@7a7f05408cddabc75ca3c5252097e238021680a8
+latest: git://github.com/docker-library/rails@7a7f05408cddabc75ca3c5252097e238021680a8
 
-onbuild: git://github.com/docker-library/rails@90ccf97ef73b253dadd2e4d5466976fbef7de08f onbuild
+onbuild: git://github.com/docker-library/rails@940d1a7d0fc11d32aed4eb3b2cb22f62f65c6814 onbuild
diff --git a/library/redis b/library/redis
index 7fd4e4d18e2e5..9f24777ebc8b2 100644
--- a/library/redis
+++ b/library/redis
@@ -1,9 +1,9 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-2.6.17: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.6
-2.6: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.6
+2.6.17: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.6
+2.6: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.6
 
-2.8.17: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.8
-2.8: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.8
-2: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.8
-latest: git://github.com/docker-library/redis@9e5054fef2e6d1fdd7035ecb4ed0ae68e10bd6d6 2.8
+2.8.19: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.8
+2.8: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.8
+2: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.8
+latest: git://github.com/docker-library/redis@062335e0a8d20cab2041f25dfff2fbaf58544471 2.8
diff --git a/library/registry b/library/registry
index db9356d43c9a9..879bc05c2f133 100644
--- a/library/registry
+++ b/library/registry
@@ -1,6 +1,6 @@
 # maintainer: Joffrey F <joffrey@docker.com> (@shin-)
 # maintainer: Sam Alba <sam@dotcloud.com> (@samalba)
 
-latest: git://github.com/docker/docker-registry@0.9.0
+latest: git://github.com/docker/docker-registry@0.9.1
 0.8.1: git://github.com/docker/docker-registry@0.8.1
-0.9.0: git://github.com/docker/docker-registry@0.9.0
+0.9.1: git://github.com/docker/docker-registry@0.9.1
diff --git a/library/rethinkdb b/library/rethinkdb
new file mode 100644
index 0000000000000..30e47e9505682
--- /dev/null
+++ b/library/rethinkdb
@@ -0,0 +1,8 @@
+# maintainer: Stuart P. Bentley <stuart@testtrack4.com> (@stuartpb)
+
+1.15.1: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.1
+1.15.2: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.2
+1.15.3: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.3
+1.15: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.3
+1: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.3
+latest: git://github.com/stuartpb/rethinkdb-dockerfiles@8990b61b5881039e15049f3b73191e37ba640cff 1.15.3
diff --git a/library/ruby b/library/ruby
index 5099fae415fc3..081926cccd1d8 100644
--- a/library/ruby
+++ b/library/ruby
@@ -1,29 +1,52 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-1.9.3-p550: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9
-1.9.3: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9
-1.9: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9
-1: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9
-
-1.9.3-p550-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9/onbuild
-1.9.3-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9/onbuild
-1.9-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9/onbuild
-1-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 1.9/onbuild
-
-2.0.0-p594: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0
-2.0.0: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0
-2.0: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0
-
-2.0.0-p594-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0/onbuild
-2.0.0-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0/onbuild
-2.0-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.0/onbuild
-
-2.1.4: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1
-2.1: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1
-2: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1
-latest: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1
-
-2.1.4-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1/onbuild
-2.1-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1/onbuild
-2-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1/onbuild
-onbuild: git://github.com/docker-library/ruby@59efe8f7291ffddf5c8b3f8b6f784ad80905f34c 2.1/onbuild
+1.9.3-p551: git://github.com/docker-library/ruby@d5756576efdfd4543d9ee0b9ea4d56800b1bba1b 1.9
+1.9.3: git://github.com/docker-library/ruby@d5756576efdfd4543d9ee0b9ea4d56800b1bba1b 1.9
+1.9: git://github.com/docker-library/ruby@d5756576efdfd4543d9ee0b9ea4d56800b1bba1b 1.9
+1: git://github.com/docker-library/ruby@d5756576efdfd4543d9ee0b9ea4d56800b1bba1b 1.9
+
+1.9.3-p551-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 1.9/onbuild
+1.9.3-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 1.9/onbuild
+1.9-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 1.9/onbuild
+1-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 1.9/onbuild
+
+1.9.3-p551-wheezy: git://github.com/docker-library/ruby@214c4ae00d7045ecb5827298fce77c35ae54e550 1.9/wheezy
+1.9.3-wheezy: git://github.com/docker-library/ruby@214c4ae00d7045ecb5827298fce77c35ae54e550 1.9/wheezy
+1.9-wheezy: git://github.com/docker-library/ruby@214c4ae00d7045ecb5827298fce77c35ae54e550 1.9/wheezy
+1-wheezy: git://github.com/docker-library/ruby@214c4ae00d7045ecb5827298fce77c35ae54e550 1.9/wheezy
+
+2.0.0-p598: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0
+2.0.0: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0
+2.0: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0
+
+2.0.0-p598-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 2.0/onbuild
+2.0.0-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 2.0/onbuild
+2.0-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 2.0/onbuild
+
+2.0.0-p598-wheezy: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0/wheezy
+2.0.0-wheezy: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0/wheezy
+2.0-wheezy: git://github.com/docker-library/ruby@28f8a1a4ab78ffe868a03bdf6281b7db9db7fbca 2.0/wheezy
+
+2.1.5: git://github.com/docker-library/ruby@7d72919217b5d99d085d485d57fad273a2a644b8 2.1
+2.1: git://github.com/docker-library/ruby@7d72919217b5d99d085d485d57fad273a2a644b8 2.1
+
+2.1.5-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 2.1/onbuild
+2.1-onbuild: git://github.com/docker-library/ruby@069e9f5f9aa4903f4a3cb4baf6325d08d9d366e6 2.1/onbuild
+
+2.1.5-wheezy: git://github.com/docker-library/ruby@7d72919217b5d99d085d485d57fad273a2a644b8 2.1/wheezy
+2.1-wheezy: git://github.com/docker-library/ruby@7d72919217b5d99d085d485d57fad273a2a644b8 2.1/wheezy
+
+2.2.0: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2
+2.2: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2
+2: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2
+latest: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2
+
+2.2.0-onbuild: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/onbuild
+2.2-onbuild: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/onbuild
+2-onbuild: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/onbuild
+onbuild: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/onbuild
+
+2.2.0-wheezy: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/wheezy
+2.2-wheezy: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/wheezy
+2-wheezy: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/wheezy
+wheezy: git://github.com/docker-library/ruby@b7fefd2fa79882da90feb0718430680c77c5fa8b 2.2/wheezy
diff --git a/library/sentry b/library/sentry
new file mode 100644
index 0000000000000..02e0ead94ff30
--- /dev/null
+++ b/library/sentry
@@ -0,0 +1,6 @@
+# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
+
+6.4.4: git://github.com/docker-library/sentry@08e7bf99eee1e7a879422fc474b73a6fafecbc31
+6.4: git://github.com/docker-library/sentry@08e7bf99eee1e7a879422fc474b73a6fafecbc31
+6: git://github.com/docker-library/sentry@08e7bf99eee1e7a879422fc474b73a6fafecbc31
+latest: git://github.com/docker-library/sentry@08e7bf99eee1e7a879422fc474b73a6fafecbc31
diff --git a/library/thrift b/library/thrift
new file mode 100644
index 0000000000000..9c71285c14fa1
--- /dev/null
+++ b/library/thrift
@@ -0,0 +1,5 @@
+# maintainer: Adam Hawkins <adam@hawkins.io> (@ahawkins)
+
+0.9: git://github.com/ahawkins/docker-thrift@61c3478ab828d3e610f192b442ac2a7221749c47 0.9
+0.9.2: git://github.com/ahawkins/docker-thrift@61c3478ab828d3e610f192b442ac2a7221749c47 0.9
+latest: git://github.com/ahawkins/docker-thrift@61c3478ab828d3e610f192b442ac2a7221749c47 0.9
diff --git a/library/tomcat b/library/tomcat
index 395e85808631b..3d09589d13653 100644
--- a/library/tomcat
+++ b/library/tomcat
@@ -1,24 +1,37 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-6.0.41-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
-6.0-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
-6-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
-6.0.41: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
-6.0: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
-6: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 6-jre7
+6.0.43-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
+6.0-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
+6-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
+6.0.43: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
+6.0: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
+6: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre7
 
-7.0.56-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
-7.0-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
-7-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
-7.0.56: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
-7.0: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
-7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 7-jre7
+6.0.43-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre8
+6.0-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre8
+6-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 6-jre8
 
-8.0.14-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-8.0-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-8-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-jre7: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-8.0.14: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-8.0: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-8: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
-latest: git://github.com/docker-library/tomcat@2c7c55c923a12607c527186fad50e6f42c3f9d6b 8-jre7
+7.0.57-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+7.0-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+7-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+7.0.57: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+7.0: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre7
+
+7.0.57-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre8
+7.0-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre8
+7-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 7-jre8
+
+8.0.15-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+8.0-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+8-jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+jre7: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+8.0.15: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+8.0: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+latest: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre7
+
+8.0.15-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre8
+8.0-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre8
+8-jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre8
+jre8: git://github.com/docker-library/tomcat@42acf24d6056b82d396da6658943f5c26e7b5cc1 8-jre8
diff --git a/library/ubuntu b/library/ubuntu
index 3bdd359baaf78..ab5608ed01f8c 100644
--- a/library/ubuntu
+++ b/library/ubuntu
@@ -1,17 +1,30 @@
 # maintainer: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
-# see https://wiki.ubuntu.com/Core#Current_Releases
+# see https://partner-images.canonical.com/core/
 # see also https://wiki.ubuntu.com/Releases#Current
-# see also http://cdimage.ubuntu.com/ubuntu-core/
 
-12.04.5: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e precise
-12.04: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e precise
-precise: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e precise
+# commits: (master..dist)
+#  - 5faea96 Update tarballs
+#    - `ubuntu:precise`: 20150115
+#    - `ubuntu:trusty`: 20150115
+#    - `ubuntu:utopic`: 20150115
+#    - `ubuntu:vivid`: 20150116
 
-14.04.1: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e trusty
-14.04: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e trusty
-trusty: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e trusty
-latest: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e trusty
+# 20150115
+12.04.5: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 precise
+12.04: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 precise
+precise: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 precise
 
-14.10: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e utopic
-utopic: git://github.com/tianon/docker-brew-ubuntu-core@85471971670295a9bad93402e18c52e4f3e1502e utopic
+# 20150115
+14.04.1: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 trusty
+14.04: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 trusty
+trusty: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 trusty
+latest: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 trusty
+
+# 20150115
+14.10: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 utopic
+utopic: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 utopic
+
+# 20150116
+15.04: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 vivid
+vivid: git://github.com/tianon/docker-brew-ubuntu-core@5faea963599714ceb09e6f4f78155a3fc64389b7 vivid
diff --git a/library/ubuntu-debootstrap b/library/ubuntu-debootstrap
index 988d97daf4d23..568ff59650a1f 100644
--- a/library/ubuntu-debootstrap
+++ b/library/ubuntu-debootstrap
@@ -1,19 +1,25 @@
 # maintainer: Tianon Gravi <admwiggin@gmail.com> (@tianon)
 
-10.04.4: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 10.04
-10.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 10.04
-lucid: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 10.04
+# commits: (master..dist)
+#  - 67a4f1c 2015-01-16 debootstraps
 
-12.04.5: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 12.04
-12.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 12.04
-precise: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 12.04
+10.04.4: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 10.04
+10.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 10.04
+lucid: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 10.04
 
-14.04.1: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.04
-14.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.04
-trusty: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.04
-latest: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.04
+12.04.5: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 12.04
+12.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 12.04
+precise: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 12.04
 
-14.10: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.10
-utopic: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 14.10
+14.04.1: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.04
+14.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.04
+trusty: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.04
+latest: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.04
 
-devel: git://github.com/tianon/docker-brew-ubuntu-debootstrap@914295f4d57271f13bb4a4f3c02f01320ce139c1 devel
+14.10: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.10
+utopic: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 14.10
+
+15.04: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 15.04
+vivid: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 15.04
+
+devel: git://github.com/tianon/docker-brew-ubuntu-debootstrap@67a4f1c8a6be130c4badbcdf5bd327e7b93233a8 devel
diff --git a/library/wordpress b/library/wordpress
index 459a2d52170ea..9fda114a73052 100644
--- a/library/wordpress
+++ b/library/wordpress
@@ -1,6 +1,6 @@
 # maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)
 
-4.0.0: git://github.com/docker-library/wordpress@8a3f1826ecd05b20a1e903bf250cc836c7b9657c
-4.0: git://github.com/docker-library/wordpress@8a3f1826ecd05b20a1e903bf250cc836c7b9657c
-4: git://github.com/docker-library/wordpress@8a3f1826ecd05b20a1e903bf250cc836c7b9657c
-latest: git://github.com/docker-library/wordpress@8a3f1826ecd05b20a1e903bf250cc836c7b9657c
+4.1.0: git://github.com/docker-library/wordpress@990b1b00b8ca4903e11e53e908b1996fbaab3c1a
+4.1: git://github.com/docker-library/wordpress@990b1b00b8ca4903e11e53e908b1996fbaab3c1a
+4: git://github.com/docker-library/wordpress@990b1b00b8ca4903e11e53e908b1996fbaab3c1a
+latest: git://github.com/docker-library/wordpress@990b1b00b8ca4903e11e53e908b1996fbaab3c1a