diff --git a/9.5/Dockerfile b/9.5/Dockerfile
index 9d9ab9c822..332cf25b2b 100644
--- a/9.5/Dockerfile
+++ b/9.5/Dockerfile
@@ -24,7 +24,7 @@ RUN mkdir /docker-entrypoint-initdb.d
 RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys B97B0AFCAA1A47F044F244A07FCC7D46ACCC4CF8
 
 ENV PG_MAJOR 9.5
-ENV PG_VERSION 9.5~beta1-1.pgdg80+1
+ENV PG_VERSION 9.5~beta2-1.pgdg80+1
 
 RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
 
diff --git a/update.sh b/update.sh
index d26ada624a..238abc50c1 100755
--- a/update.sh
+++ b/update.sh
@@ -9,13 +9,13 @@ if [ ${#versions[@]} -eq 0 ]; then
 fi
 versions=( "${versions[@]%/}" )
 
-packagesUrl='http://apt.postgresql.org/pub/repos/apt/dists/jessie-pgdg/main/binary-amd64/Packages'
-packages="$(echo "$packagesUrl" | sed -r 's/[^a-zA-Z.-]+/-/g')"
-curl -sSL "${packagesUrl}.bz2" | bunzip2 > "$packages"
+packagesBase='http://apt.postgresql.org/pub/repos/apt/dists/jessie-pgdg'
+mainList="$(curl -fsSL "$packagesBase/main/binary-amd64/Packages.bz2" | bunzip2)"
 
 travisEnv=
 for version in "${versions[@]}"; do
-	fullVersion="$(grep -m1 -A10 "^Package: postgresql-$version\$" "$packages" | grep -m1 '^Version: ' | cut -d' ' -f2)"
+	versionList="$(echo "$mainList"; curl -fsSL "$packagesBase/$version/binary-amd64/Packages.bz2" | bunzip2)"
+	fullVersion="$(echo "$versionList" | awk -F ': ' '$1 == "Package" { pkg = $2 } $1 == "Version" && pkg == "postgresql-'"$version"'" { print $2 }')"
 	(
 		set -x
 		cp docker-entrypoint.sh "$version/"
@@ -27,5 +27,3 @@ done
 
 travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
 echo "$travis" > .travis.yml
-
-rm "$packages"