diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template
index f4ee0f2d9e7..0aa8d571a1b 100644
--- a/srcpkgs/dvtm/template
+++ b/srcpkgs/dvtm/template
@@ -3,7 +3,6 @@ pkgname=dvtm
 version=0.9
 revision=3
 makedepends="ncurses-devel"
-fulldepends="ncurses" # needs tic at post-install
 short_desc="Tiling window manager for the console"
 maintainer="pancake <pancake@nopcode.org>"
 homepage="http://www.brain-dump.org/projects/dvtm/"
@@ -26,6 +25,7 @@ do_install() {
 }
 
 dvtm_package() {
+	depends="ncurses" # needs tic at post-install
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template
index 8358c3715e4..e732c490626 100644
--- a/srcpkgs/font-bitstream-speedo/template
+++ b/srcpkgs/font-bitstream-speedo/template
@@ -1,15 +1,15 @@
 # Template build file for 'font-bitstream-speedo'.
 pkgname=font-bitstream-speedo
 version=1.0.0
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-makedepends="pkg-config bdftopcf"
-fulldepends="font-util"
 revision=2
+build_style=gnu-configure
+hostmakedepends="pkg-config bdftopcf"
+makedepends="font-util"
 short_desc="Standard Speedo Bitstream PCF fonts"
 homepage="http://xorg.freedesktop.org/"
 license="MIT"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6
 long_desc="
  These are the PCF versions of the following Speedo Bitstream fonts:
@@ -17,16 +17,12 @@ long_desc="
 
  This is from the modular Xorg project."
 
-
-noarch=yes
-font_dirs="/usr/lib/X11/fonts/Speedo"
-
-post_install()
-{
+post_install() {
 	rm -f ${DESTDIR}/${font_dirs}/fonts.*
 }
 
 font-bitstream-speedo_package() {
+	depends="font-util"
 	noarch="yes"
 	font_dirs="/usr/lib/X11/fonts/Speedo"
 	pkg_install() {
diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template
index f0667b6ba00..69cb8bba9b6 100644
--- a/srcpkgs/libsoup/template
+++ b/srcpkgs/libsoup/template
@@ -5,8 +5,7 @@ revision=2
 build_style=gnu-configure
 configure_args="--disable-static"
 hostmakedepends="pkg-config intltool gobject-introspection"
-makedepends="libglib-devel libxml2-devel sqlite-devel"
-fulldepends="glib-networking"
+makedepends="libglib-devel libxml2-devel sqlite-devel glib-networking"
 short_desc="HTTP library implementation in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.gnome.org"
@@ -44,6 +43,7 @@ libsoup-gnome_package() {
 }
 
 libsoup_package() {
+	depends="glib-networking"
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template
index bd5677c78d1..0bf13e3a384 100644
--- a/srcpkgs/lxterminal/template
+++ b/srcpkgs/lxterminal/template
@@ -4,8 +4,7 @@ version=0.1.11
 revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtk+-devel vte-devel"
-fulldepends="desktop-file-utils"
+makedepends="gtk+-devel vte-devel desktop-file-utils"
 short_desc="LXDE Terminal emulator"
 homepage="http://lxde.org/"
 license="GPL2"
@@ -21,6 +20,7 @@ long_desc="
  of the terminal are sharing a single process."
 
 lxterminal_package() {
+	depends="desktop-file-utils"
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template
index 7681bca2feb..06cdfbb9637 100644
--- a/srcpkgs/muffin/template
+++ b/srcpkgs/muffin/template
@@ -5,9 +5,7 @@ revision=2
 hostmakedepends="automake gettext-devel pkg-config intltool
  gnome-doc-utils gobject-introspection"
 makedepends="clutter-devel>=1.14 GConf-devel libcanberra-devel libXxf86vm-devel
- startup-notification-devel gsettings-desktop-schemas-devel>=3.6.0"
-depends="desktop-file-utils gsettings-desktop-schemas>=3.6.0"
-fulldepends="zenity"
+ startup-notification-devel gsettings-desktop-schemas-devel>=3.6.0 zenity"
 short_desc="The Cinnamon window manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
@@ -58,6 +56,7 @@ libmuffin-devel_package() {
 }
 
 muffin_package() {
+	depends="zenity desktop-file-utils gsettings-desktop-schemas>=3.6.0"
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template
index 38e62ae938f..05d66482f8b 100644
--- a/srcpkgs/pciutils/template
+++ b/srcpkgs/pciutils/template
@@ -4,7 +4,7 @@ version=3.1.10
 revision=2
 homepage="http://mj.ucw.cz/pciutils.html"
 distfiles="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${version}.tar.gz"
-fulldepends="hwids"
+makedepends="hwids"
 short_desc="PCI bus related utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -48,6 +48,7 @@ pciutils-devel_package() {
 }
 
 pciutils_package() {
+	depends="hwids"
 	pkg_install() {
 		vmove usr
 	}
diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index ad8e340bf5c..9fac86850e6 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -13,8 +13,6 @@ disable_debug=yes
 broken_as_needed=yes
 
 # XXX add support for webserver (microhttpd), afp and libcec.
-fulldepends="udisks upower hicolor-icon-theme desktop-file-utils mesa-demos"
-
 makedepends="pkg-config gperf cmake zip unzip nasm yasm libudev-devel>=183
  pcre-devel>=8.30 expat-devel libpng-devel>=1.5.10 libjpeg-turbo-devel tiff-devel
  libXrandr-devel avahi-libs-devel pulseaudio-devel SDL_mixer-devel samba-devel
@@ -26,6 +24,8 @@ makedepends="pkg-config gperf cmake zip unzip nasm yasm libudev-devel>=183
  libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel
  taglib-devel libcap-devel lame-devel swig jre libbluray-devel libnfs-devel"
 
+makedepends+=" udisks upower hicolor-icon-theme desktop-file-utils mesa-demos"
+
 do_build() {
 	. /etc/profile.d/jre.sh