diff --git a/a/libaacs-git/PKGBUILD b/b/libaacs-git/PKGBUILD
index f542469..20b6875 100644
--- a/a/libaacs-git/PKGBUILD
+++ b/b/libaacs-git/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
+# Contributer: Andrew Cook <ariscop@gmail.com>

 pkgname=libaacs-git
-pkgver=20120219
+pkgver=20120418
 pkgrel=1
 pkgdesc="Advanced Access Content System (GIT version)"
 arch=('i686' 'x86_64')
@@ -19,24 +20,26 @@ _gitname="libaacs"
 build() {
     msg "Connecting to GIT server..."

-    if [ -d "${srcdir}"/"${_gitname}" ] ; then
+    if [ -d "${srcdir}/${_gitname}" ] ; then
         cd "${_gitname}" && git pull origin
     else
-        git clone "${_gitroot}"
+        git clone --depth=1 "${_gitroot}"
     fi

-    [ -d "${srcdir}"/"${_gitname}"-build ] && rm -fr "${srcdir}"/"${_gitname}"-build
-    cp -R "${srcdir}"/"${_gitname}" "${srcdir}"/"${_gitname}"-build
+    cd "${srcdir}"
+
+    [ -d "${_gitname}-build" ] && rm -fr "${_gitname}-build"
+    cp -R "${_gitname}" "${_gitname}-build"

     msg "GIT checkout done or server timeout"
     msg "Starting build..."

-    cd "${srcdir}"/"${_gitname}"-build
+    cd "${_gitname}-build"
     ./bootstrap
     ./configure --prefix=/usr
     make
 }
 package() {
-    cd "${srcdir}"/"${_gitname}"-build
+    cd "${srcdir}/${_gitname}-build"
     make DESTDIR="${pkgdir}" install
 }
diff --git a/a/libbluray-git/PKGBUILD b/b/libbluray-git/PKGBUILD
index 20443ff..6658534 100644
--- a/a/libbluray-git/PKGBUILD
+++ b/b/libbluray-git/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
+# Contributer: Andrew Cook <ariscop@gmail.com>

 pkgname=libbluray-git
-pkgver=20120219
+pkgver=20120418
 pkgrel=1
 pkgdesc="Blu-Ray access library"
 arch=('i686' 'x86_64')
@@ -20,24 +21,31 @@ _gitname="libbluray"
 build() {
     msg "Connecting to GIT server..."

-    if [ -d "${srcdir}"/"${_gitname}" ] ; then
+    if [ -d "${srcdir}/${_gitname}" ] ; then
         cd "${_gitname}" && git pull origin
     else
-        git clone "${_gitroot}"
+        git clone --depth=1 "${_gitroot}"
     fi

-    [ -d "${srcdir}"/"${_gitname}"-build ] && rm -fr "${srcdir}"/"${_gitname}"-build
-    cp -R "${srcdir}"/"${_gitname}" "${srcdir}"/"${_gitname}"-build
+    cd "${srcdir}"
+    [ -d "${_gitname}-build" ] && rm -fr "${_gitname}-build"
+    cp -R "${_gitname}" "${_gitname}-build"

     msg "GIT checkout done or server timeout"
     msg "Starting build..."

-    cd "${srcdir}"/"${_gitname}"-build
+    cd "${_gitname}-build"
+
+    # If java-environement is installed for the first time
+    # we need to source profile to set JAVA_HOME
+    source /etc/profile
+
     ./bootstrap
     ./configure --prefix=/usr --with-jdk=$J2SDKDIR --enable-bdjava
     make
 }
+
 package() {
-    cd "${srcdir}"/"${_gitname}"-build
+    cd "${srcdir}/${_gitname}-build"
     make DESTDIR="${pkgdir}" install
 }