diff --git a/TECH_NOTES b/TECH_NOTES
index 9653e0b..aed288b 100644
--- a/TECH_NOTES
+++ b/TECH_NOTES
@@ -30,7 +30,7 @@ on its own.
 
 The cron scripts
 ----------------
-The cron script (cron/cron.sh) updates the SVN checkouts, runs
+The cron script (cron/cron.sh) updates the Git checkouts, runs
 configure and make. Then it calls cron.php with generated log files.
 Each php cron script is in a separated file, to follow a plugin-style
 architecture. Each script then produces a .inc file that consists of
diff --git a/cron/cron.sh b/cron/cron.sh
index 42833d4..eb1e244 100755
--- a/cron/cron.sh
+++ b/cron/cron.sh
@@ -90,9 +90,9 @@ do
 		PIDFILE=${OUTDIR}/build.pid
 
 		if [ "${PHPTAG}" = "PHP_HEAD" ]; then
-			SVNDIR="trunk"
+			GITBRANCH="master"
 		else
-			SVNDIR="branches/${PHPTAG}"
+			GITBRANCH=`echo "$PHPTAG" | sed 's/_\([0-9]*\)/-\1/' | sed 's/_/./g'`
 		fi
 
 		mkdir -p $OUTDIR
@@ -103,12 +103,13 @@ do
 		cd ${PHPROOT}
 		if [ -d ${PHPTAG} ]; then
 			cd ${PHPTAG}
-			svn up
+			git pull
 		else
-			svn co "http://svn.php.net/repository/php/php-src/${SVNDIR}" ${PHPTAG}
+			git clone http://git.php.net/repository/php-src.git -b $GITBRANCH $PHPTAG
 			cd ${PHPTAG}
 		fi
 		./vcsclean
+		cp "../config.$PHPTAG" config.nice
 
  		if [ "${PHPTAG}" = "PHP_5_3" ]; then
  			PHP_AUTOCONF=autoconf-2.13 ./buildconf --force > /dev/null