diff --git a/srcpkgs/avahi/avahi-compat-libs-devel.template b/srcpkgs/avahi/avahi-compat-libs-devel.template
index 4f554fd2d99..07c3364bb00 100644
--- a/srcpkgs/avahi/avahi-compat-libs-devel.template
+++ b/srcpkgs/avahi/avahi-compat-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the HOWL compatibility
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run avahi-libs-devel
 Add_dependency run avahi-compat-libs
 
diff --git a/srcpkgs/avahi/avahi-compat-libs.template b/srcpkgs/avahi/avahi-compat-libs.template
index c062b3cfb21..8a3f99531f5 100644
--- a/srcpkgs/avahi/avahi-compat-libs.template
+++ b/srcpkgs/avahi/avahi-compat-libs.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains howl/mDNSResponder compatibility shared
  libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/avahi-glib-libs-devel.template b/srcpkgs/avahi/avahi-glib-libs-devel.template
index 63a6f58148c..a96e570c1bc 100644
--- a/srcpkgs/avahi/avahi-glib-libs-devel.template
+++ b/srcpkgs/avahi/avahi-glib-libs-devel.template
@@ -6,9 +6,9 @@ long_desc="${long_desc}
  This package contains development files for the glib libraries
  provided by Avahi."
 
-Add_dependency run glibc-devel
-Add_dependency run avahi-libs-devel
-Add_dependency run glib-devel
+revision=1
+
+Add_dependency run avahi-glib-libs
 
 do_install()
 {
diff --git a/srcpkgs/avahi/avahi-glib-libs.template b/srcpkgs/avahi/avahi-glib-libs.template
index a63a2176ff8..a248a1ba68e 100644
--- a/srcpkgs/avahi/avahi-glib-libs.template
+++ b/srcpkgs/avahi/avahi-glib-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the glib shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/avahi-libs-devel.template b/srcpkgs/avahi/avahi-libs-devel.template
index cc663d467cc..49b364b229f 100644
--- a/srcpkgs/avahi/avahi-libs-devel.template
+++ b/srcpkgs/avahi/avahi-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the core libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run libssp-devel
 Add_dependency run dbus-devel
diff --git a/srcpkgs/avahi/avahi-libs.template b/srcpkgs/avahi/avahi-libs.template
index 380ab8be27c..ad59ee25ef4 100644
--- a/srcpkgs/avahi/avahi-libs.template
+++ b/srcpkgs/avahi/avahi-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains core shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/avahi-ui-libs-devel.template b/srcpkgs/avahi/avahi-ui-libs-devel.template
index 02b788746d7..bd7da3c44e6 100644
--- a/srcpkgs/avahi/avahi-ui-libs-devel.template
+++ b/srcpkgs/avahi/avahi-ui-libs-devel.template
@@ -6,6 +6,8 @@ long_desc="${long_desc}
  This package contains development files for the UI libraries
  provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run avahi-libs-devel
 Add_dependency run gtk+-devel
diff --git a/srcpkgs/avahi/avahi-ui-libs-gtk3.template b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
index c0f523c7907..d61e147a7d5 100644
--- a/srcpkgs/avahi/avahi-ui-libs-gtk3.template
+++ b/srcpkgs/avahi/avahi-ui-libs-gtk3.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the GTK+3 UI shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run libssp
 Add_dependency run gdbm
diff --git a/srcpkgs/avahi/avahi-ui-libs.template b/srcpkgs/avahi/avahi-ui-libs.template
index 02fb7eb2f84..ae85bb34a37 100644
--- a/srcpkgs/avahi/avahi-ui-libs.template
+++ b/srcpkgs/avahi/avahi-ui-libs.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains the UI shared libraries provided by Avahi."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run avahi-libs
 Add_dependency run dbus-libs
diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template
index 000e10e795c..4848c39c47b 100644
--- a/srcpkgs/avahi/template
+++ b/srcpkgs/avahi/template
@@ -2,13 +2,7 @@
 pkgname=avahi
 version=0.6.30
 distfiles="http://www.avahi.org/download/avahi-$version.tar.gz"
-build_style=gnu_configure
-configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc
---disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl
---with-xml=expat --with-avahi-user=avahi --with-avahi-group=avahi
---with-avahi-priv-access-group=netdev --with-autoipd-user=avahi
---with-autoipd-group=avahi --with-distro=gentoo --disable-xmltoman
---disable-dbm --localstatedir=/var"
+build_style=custom-install
 short_desc="Multicast DNS Service Discovery"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=f9e4316c2339d0020726edd846d01bee0c39980906db0c247479e5807457ff1f
@@ -56,3 +50,22 @@ Add_dependency build dbus-python
 Add_dependency build libglade-devel
 Add_dependency build gtk+3-devel
 Add_dependency build gobject-introspection
+
+do_build()
+{
+	export CFLAGS="$XBPS_CFLAGS -fPIC"
+	./configure ${CONFIGURE_SHARED_ARGS} --disable-qt3 --disable-qt4 \
+		--disable-mono --disable-monodoc --disable-doxygen-doc \
+		--enable-compat-libdns_sd --enable-compat-howl \
+		--with-xml=expat --with-avahi-user=avahi \
+		--with-avahi-group=avahi --with-avahi-priv-access-group=netdev \
+		--with-autoipd-user=avahi --with-autoipd-group=avahi \
+		--with-distro=gentoo --disable-xmltoman --localstatedir=/var \
+		--disable-dbm
+	make ${makejobs}
+}
+
+do_install()
+{
+	make DESTDIR=${DESTDIR} install
+}
diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template
index b0b9ec3c45d..f058234dd03 100644
--- a/srcpkgs/dash/template
+++ b/srcpkgs/dash/template
@@ -4,8 +4,7 @@ version=0.5.6.1
 revision=1
 distfiles="http://gondor.apana.org.au/~herbert/dash/files/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--prefix="
-configure_env="LANG=C"
+configure_args="--prefix= LANG=C"
 short_desc="POSIX-compliant Unix shell, much smaller than GNU bash"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=666b52375e69a213ee6270bae3bbe8000b66d9b442b1d8d06fc3317c22125d4e
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 2473e0fa5cc..5a0ed12a677 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -41,13 +41,16 @@ Add_dependency run gtk+
 Add_dependency run xulrunner
 
 Add_dependency build zip
-Add_dependency build perl
-Add_dependency build python
+Add_dependency build perl	">=0"
+Add_dependency build python	">=0"
+Add_dependency build yasm
 Add_dependency build glibc-devel
 Add_dependency build libstdc++-devel
 Add_dependency build xulrunner-devel
 Add_dependency build nspr-devel
 Add_dependency build gtk+-devel
+Add_dependency build libevent-devel
+Add_dependency build hunspell-devel
 
 post_install()
 {
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index 74e1bce933b..316adab7a17 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -109,6 +109,7 @@ Add_dependency build libsamplerate-devel
 Add_dependency build libmms-devel
 Add_dependency build enca-devel
 Add_dependency build bzip2-devel
+Add_dependency build boost-devel
 
 Add_dependency full dbus		">=0"
 Add_dependency full udisks		">=0"