diff --git a/2/onbuild/Dockerfile b/2/onbuild/Dockerfile
new file mode 100644
index 000000000..cbe6aab6d
--- /dev/null
+++ b/2/onbuild/Dockerfile
@@ -0,0 +1,9 @@
+FROM python:2.7.8
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+ONBUILD COPY requirements.txt /usr/src/app/
+ONBUILD RUN pip install -r requirements.txt
+
+ONBUILD COPY . /usr/src/app
diff --git a/3/onbuild/Dockerfile b/3/onbuild/Dockerfile
new file mode 100644
index 000000000..184cb325a
--- /dev/null
+++ b/3/onbuild/Dockerfile
@@ -0,0 +1,9 @@
+FROM python:3.4.1
+
+RUN mkdir -p /usr/src/app
+WORKDIR /usr/src/app
+
+ONBUILD COPY requirements.txt /usr/src/app/
+ONBUILD RUN pip install -r requirements.txt
+
+ONBUILD COPY . /usr/src/app
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 916bc97d6..c17991b27 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -10,7 +10,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 versions=( */ )
 versions=( "${versions[@]%/}" )
-url='git://github.com/docker-library/docker-python'
+url='git://github.com/docker-library/python'
 
 echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 
@@ -24,4 +24,17 @@ for version in "${versions[@]}"; do
 	for va in "${versionAliases[@]}"; do
 		echo "$va: ${url}@${commit} $version"
 	done
+	
+	for variant in onbuild; do
+		commit="$(git log -1 --format='format:%H' "$version/$variant")"
+		echo
+		for va in "${versionAliases[@]}"; do
+			if [ "$va" = 'latest' ]; then
+				va="$variant"
+			else
+				va="$va-$variant"
+			fi
+			echo "$va: ${url}@${commit} $version/$variant"
+		done
+	done
 done
diff --git a/update.sh b/update.sh
new file mode 100755
index 000000000..04405613a
--- /dev/null
+++ b/update.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+versions=( "$@" )
+if [ ${#versions[@]} -eq 0 ]; then
+	versions=( */ )
+fi
+versions=( "${versions[@]%/}" )
+
+for version in "${versions[@]}"; do
+	fullVersion="$(curl -sSL 'https://www.python.org/ftp/python/' | grep '<a href="'"$version." | sed -r 's!.*<a href="([^"/]+)/?".*!\1!' | sort -V | tail -1)"
+	(
+		set -x
+		sed -ri 's/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile"
+		sed -ri 's/^(FROM python):.*/\1:'"$fullVersion"'/' "$version/onbuild/Dockerfile"
+	)
+done