diff --git a/package/base/device-mapper/device-mapper.conf b/package/base/device-mapper/device-mapper.conf
index e05e9f201..c5e1500d2 100644
--- a/package/base/device-mapper/device-mapper.conf
+++ b/package/base/device-mapper/device-mapper.conf
@@ -31,5 +31,6 @@ devicemapper_pm() {
 }
 
 srcdir="device-mapper.$ver"
+[ "$root/$prefix" = "/usr" ] && confopt=""
 libdir="$root/$multilib"
 postmake="devicemapper_pm"
diff --git a/package/base/samba/samba.conf b/package/base/samba/samba.conf
index 8bdd8a398..8c407d355 100644
--- a/package/base/samba/samba.conf
+++ b/package/base/samba/samba.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -50,9 +51,9 @@ var_append extraconfopt ' ' "--with-nisplus-home"
 # let samba configure find ldap and enable ldapsam
 if pkginstalled openldap; then
 	var_append extraconfopt ' ' "--with-ldapsam"
-	var_append extraconfopt ' ' "CFLAGS=\"$CFLAGS${CFLAGS:+ }-I$root/$pkg_openldap_prefix/include\""
-	var_append extraconfopt ' ' "CPPFLAGS=\"$CPPFLAGS${CPPFLAGS:+ }-I$root/$pkg_openldap_prefix/include\""
-	var_append extraconfopt ' ' "LDFLAGS=\"$LDFLAGS${LDFLAGS:+ }-L$root/$pkg_openldap_prefix/lib\""
+	var_append CFLAGS " " "-I$root/$pkg_openldap_prefix/include"
+	var_append CPPFLAGS " " "-I$root/$pkg_openldap_prefix/include"
+	var_append extraconfopt " " "-L$root/$pkg_openldap_prefix/lib"
 fi
 
 samba_pm ()
diff --git a/package/base/xfsprogs/xfsprogs.conf b/package/base/xfsprogs/xfsprogs.conf
index 0fa240f37..823d49096 100644
--- a/package/base/xfsprogs/xfsprogs.conf
+++ b/package/base/xfsprogs/xfsprogs.conf
@@ -38,3 +38,5 @@ libdir="$root/lib"
 # also install headers and libs
 makeinstopt="$makeinstopt install-dev"
 
+# unset CFLAGS as this causes build errors
+hook_add preconf 5 "unset CFLAGS"
diff --git a/package/base/xfsprogs/xfsprogs.desc b/package/base/xfsprogs/xfsprogs.desc
index da92d76a5..141287556 100644
--- a/package/base/xfsprogs/xfsprogs.desc
+++ b/package/base/xfsprogs/xfsprogs.desc
@@ -42,8 +42,8 @@
 
 [L] GPL
 [S] Stable
-[V] 2.8.20-1
+[V] 2.9.4-1
 [P] X --?--5---9 218.800
 
-[D] 681330267 xfsprogs_2.8.20-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/
+[D] 1109542766 xfsprogs_2.9.4-1.tar.gz ftp://oss.sgi.com/projects/xfs/cmd_tars/
 
diff --git a/package/base/zlib/zlib.desc b/package/base/zlib/zlib.desc
index 80ef1e2ee..cc5e1c8be 100644
--- a/package/base/zlib/zlib.desc
+++ b/package/base/zlib/zlib.desc
@@ -43,7 +43,7 @@
 [L] OpenSource
 [S] Stable
 [V] 1.2.3
-[P] X --X--5---9 104.500
+[P] X --2--5---9 101.200
 
 [D] 623948124 zlib-1.2.3.tar.bz2 http://www.zlib.net/