diff --git a/alarm/marvell-libbmm/PKGBUILD b/alarm/marvell-libbmm/PKGBUILD
index 09dbfdcc1..88e6c7ffc 100644
--- a/alarm/marvell-libbmm/PKGBUILD
+++ b/alarm/marvell-libbmm/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=4
 
 pkgname="marvell-libbmm"
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://archlinuxarm.org"
 license=('Proprietary')
@@ -21,12 +21,12 @@ package() {
   pkgdesc="Marvell Block/buffer memory management for hardware accelerators"
 
   cd "${srcdir}/${pkgname}-${pkgver}"
-  mkdir -p "${pkgdir}/usr/lib"
-  cp libbmm.so.0u.1 "${pkgdir}/usr/lib"
+  install -Dm755 libbmm.so.0u.1 "${pkgdir}/usr/lib/libbmm.so.0u.1"
+  install -Dm644 bmm_lib.h "${pkgdir}/usr/include/bmm_lib.h"
+  install -Dm644 etc/udev/rules.d/99-bmm.rules \
+    "${pkgdir}/usr/lib/udev/rules.d/99-bmm.rules"
   ln -s /usr/lib/libbmm.so.0u.1 "${pkgdir}/usr/lib/libbmm.so.0u"
   ln -s /usr/lib/libbmm.so.0u.1 "${pkgdir}/usr/lib/libbmm.so"
-  mkdir -p "${pkgdir}/usr/include"
-  cp bmm_lib.h "${pkgdir}/usr/include"
 }
 
 md5sums=('7dd1b311232b0ebe0ca4538844c47806')
diff --git a/alarm/marvell-libgfx/PKGBUILD b/alarm/marvell-libgfx/PKGBUILD
index bb2d169ba..45731fb2a 100644
--- a/alarm/marvell-libgfx/PKGBUILD
+++ b/alarm/marvell-libgfx/PKGBUILD
@@ -6,33 +6,35 @@ buildarch=4
 
 pkgname="marvell-libgfx"
 pkgver=0.2.0
-pkgrel=3
+pkgrel=4
 arch=('armv7h')
 url="http://archlinuxarm.org"
 license=('Proprietary')
 source=("http://archlinuxarm.org/builder/src/marvell-libgfx-0.2.0.tar.gz"
         "http://archlinuxarm.org/builder/src/gc3184-gcc-4.6-armv7-hard_release.zip")
+provides=('libegl' 'libgles' 'khrplatform-devel')
+conflicts=('libegl' 'libgles' 'khrplatform-devel')
 
 package() {
   pkgdesc="Armada 510/Dove graphics Libraries"
 
-  cd "${srcdir}/${pkgname}-${pkgver}/bin"
-  mkdir -p "${pkgdir}/usr/lib"
-  mkdir -p "${pkgdir}/usr/include"
-  cp libGAL.so.1 libgcu.so.1 libOpenVG.so.1 libVDK.so.1 libGLES_CM.so.1 libGLESv2SC.so.1 libGLESv2x.so.1 "${pkgdir}/usr/lib"
-  ln -s /usr/lib/libGAL.so.1 "${pkgdir}/usr/lib/libGAL.so"
-  ln -s /usr/lib/libgcu.so.1 "${pkgdir}/usr/lib/libgcu.so"
-  ln -s /usr/lib/libOpenVG.so.1 "${pkgdir}/usr/lib/libOpenVG.so"
-  ln -s /usr/lib/libVDK.so.1 "${pkgdir}/usr/lib/libVDK.so"
-  ln -s /usr/lib/libGLES_CM.so.1 "${pkgdir}/usr/lib/libGLES_CM.so"
-  ln -s /usr/lib/libGLESv2SC.so.1 "${pkgdir}/usr/lib/libGLESv2SC.so"
-  ln -s /usr/lib/libGLESv2x.so.1 "${pkgdir}/usr/lib/libGLESv2x.so"
-  cd "${srcdir}/${pkgname}-${pkgver}/include"
-  cp -r gcu.h vdk.h vdkTypes.h HAL VG "${pkgdir}/usr/include"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  find include -type f -not -path "include/KHR*" -exec \
+    install -Dm644 {} "${pkgdir}/usr/{}" \;
+
+  install -Dm644 etc/udev/rules.d/99-galcore.rules \
+    "${pkgdir}/usr/lib/udev/rules.d/99-galcore.rules"
+
+  cd bin
+  for _lib in $(find -type f); do
+    install -m755 ${_lib} "${pkgdir}/usr/lib/"
+    ln -s /usr/lib/${_lib#./} "${pkgdir}/usr/lib/${_lib%.1}"
+  done
+  ln -s /usr/lib/libGLES_CM.so.1 "${pkgdir}/usr/lib/libGLESv1_CM.so"
+  ln -s /usr/lib/libGLESv2x.so.1 "${pkgdir}/usr/lib/libGLESv2.so"
 
   cp "${srcdir}"/gc3184-gcc-4.6-armv7-hard_release/sdk/drivers/{libVIVANTE,libGLES_CL}.so "${pkgdir}/usr/lib"
-  mkdir -p "${pkgdir}/usr/include/KHR/"
-  cp "${srcdir}/gc3184-gcc-4.6-armv7-hard_release/sdk/include/KHR/khrvivante.h" "${pkgdir}/usr/include/KHR/"
+  cp -r "${srcdir}/gc3184-gcc-4.6-armv7-hard_release/sdk/include/KHR" "${pkgdir}/usr/include"
 }
 
 md5sums=('6cd584e6feb6a8605662bb2280676f65'