diff --git a/alarm/uboot-sunxi/PKGBUILD b/alarm/uboot-sunxi/PKGBUILD
index 7787c79a7..f071f9168 100644
--- a/alarm/uboot-sunxi/PKGBUILD
+++ b/alarm/uboot-sunxi/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=4
 pkgbase=uboot-sunxi
 pkgname=('uboot-cubieboard2')
 pkgver=2013.07
-pkgrel=2
+pkgrel=4
 arch=('armv7h')
 url="https://github.com/linux-sunxi/u-boot-sunxi/tree/sunxi-current"
 license=('GPL')
@@ -18,7 +18,7 @@ source=("https://github.com/linux-sunxi/u-boot-sunxi/archive/${_commit}.tar.gz"
 md5sums=('7612f5c721a2804a36b41ba33925be02'
          '8b95ce286b84f52928bc0b4b07edd00a'
          '7423919c2ead208c5a04756edb6b948c'
-         '3bd9b63f722905f18f750c1eec98ce1e')
+         'd41d8cd98f00b204e9800998ecf8427e')
 
 prepare() {
   cd u-boot-sunxi-${_commit}
@@ -30,6 +30,7 @@ build() {
   
   unset CFLAGS
   unset CXXFLAGS
+  unset LDFLAGS
   
   for i in Cubieboard2; do
     mkdir bin_${i}
diff --git a/alarm/uboot-sunxi/cubieboard2.env b/alarm/uboot-sunxi/cubieboard2.env
index 5c5029a9c..e69de29bb 100644
--- a/alarm/uboot-sunxi/cubieboard2.env
+++ b/alarm/uboot-sunxi/cubieboard2.env
@@ -1 +0,0 @@
-machid=0xf35
diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index 6dbafe011..2695c8ba6 100644
--- a/community/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -23,7 +23,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/
 options=('!emptydirs' 'staticlibs')
 replaces=('xulrunner-oss')
 sha256sums=('6eacdc549c252da57d1f51a363ad8c7e62f09ec8c796e8eb69ddb3e1008df7af'
-            '7fd271e467e7bc61907d61c64b8dd57be152443d0517df3f3579a0e12785e5cd'
+            '8fcbf45d74b34ae2f97a615d9c893356bc4b7020ab8d1af6d3d6ebd5d24d5851'
             '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
             'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
 
diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig
index 4807c7189..59810f986 100644
--- a/community/xulrunner/mozconfig
+++ b/community/xulrunner/mozconfig
@@ -9,6 +9,8 @@ ac_add_options --disable-neon
 
 # System libraries
 ac_add_options --disable-webrtc
+ac_add_options --disable-ogg
+ac_add_options --disable-opus
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg