diff --git a/bin/build-release.sh b/bin/build-release.sh
index 179ca1ca440a409e5c5bb1103e1bf0d2b68496c0..82de65a77334c9ca6e59558bb4ceea3918990be2 100755
--- a/bin/build-release.sh
+++ b/bin/build-release.sh
@@ -22,23 +22,28 @@ fi
 
 umask 0022
 
-REPOPATH="http://simplesamlphp.googlecode.com/svn/tags/$TAG/"
+REPOPATH="https://github.com/simplesamlphp/simplesamlphp.git"
 
-svn export "$REPOPATH"
+git clone $REPOPATH $TAG
+cd $TAG
+git checkout $TAG
+cd ..
 
 # Use composer only on newer versions that have a composer.json
 if [ -f "$TAG/composer.json" ]; then
-    if [ ! -x composer.phar ]; then
-        curl -sS https://getcomposer.org/installer | php
+    if [ ! -x "TAG/composer.phar" ]; then
+        curl -sS https://getcomposer.org/installer | php -- --install-dir=$TAG
     fi
 
     # Install dependencies (without vcs history or dev tools)
-    php composer.phar install --no-dev --prefer-dist -o -d "$TAG"
+    php "$TAG/composer.phar" install --no-dev --prefer-dist -o -d "$TAG"
 fi
 
 mkdir -p "$TAG/config" "$TAG/metadata"
 cp -rv "$TAG/config-templates/"* "$TAG/config/"
 cp -rv "$TAG/metadata-templates/"* "$TAG/metadata/"
+rm -rf "$TAG/.git"
+rm "$TAG/composer.phar"
 tar --owner 0 --group 0 -cvzf "$TAG.tar.gz" "$TAG"
 rm -rf "$TAG"