diff --git a/tools/build_libstagefright b/tools/build_libstagefright
index ada8d4e239..78c20841ee 100755
--- a/tools/build_libstagefright
+++ b/tools/build_libstagefright
@@ -6,15 +6,17 @@ if [ "$NDK" = "" ]; then
 fi
 
 echo "Fetching Android system headers"
-git clone --depth=1 git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base
-git clone --depth=1 git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core
+git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base
+git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core
 
 echo "Fetching Android libraries for linking"
 # Libraries from any froyo/gingerbread device/emulator should work
 # fine, since the symbols used should be available on most of them.
-if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then
-    wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../
-    unzip update-cm-7.0.3-N1-signed.zip system/lib/* -d../
+if [ ! -d "../android-libs" ]; then
+    if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then
+        wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../
+    fi
+    unzip ../update-cm-7.0.3-N1-signed.zip system/lib/* -d../
     mv ../system/lib ../android-libs
     rmdir ../system
 fi