diff --git a/alarm/raspberrypi-firmware/PKGBUILD b/alarm/raspberrypi-firmware/PKGBUILD
index c2b2f5ecc..6833dc077 100644
--- a/alarm/raspberrypi-firmware/PKGBUILD
+++ b/alarm/raspberrypi-firmware/PKGBUILD
@@ -2,7 +2,7 @@ plugrel=1
 noautobuild=1
 
 pkgname=raspberrypi-firmware
-pkgver=20120509
+pkgver=20120518
 pkgrel=1
 pkgdesc="Firmware files for Raspberry Pi"
 arch=('any')
@@ -11,8 +11,24 @@ makedepends=('git')
 license=('custom')
 options=(!strip)
 
+_gitroot=git://github.com/raspberrypi/firmware.git
+_gitname=firmware
+
+build() {
+  msg "Connecting to GIT server...."
+
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone --depth 1 "$_gitroot" "$_gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+
+  rm -f "${srcdir}"/firmware/boot/kernel.img
+}
+
 package() {
-  git clone --depth 1 git://github.com/raspberrypi/firmware.git
-  rm "${srcdir}"/firmware/boot/kernel.img
   cp -R "${srcdir}"/firmware/{boot,opt} "${pkgdir}"
 }