diff --git a/templates/ConsoleKit/depends b/templates/ConsoleKit/depends
index c53672fce78..56f78eaacaf 100644
--- a/templates/ConsoleKit/depends
+++ b/templates/ConsoleKit/depends
@@ -1,2 +1,2 @@
-abi_depends=0.3.0
-api_depends=${abi_depends}
+abi_depends=">=0.3.0"
+api_depends="${abi_depends}"
diff --git a/templates/GConf/depends b/templates/GConf/depends
index 0812aac72df..000141419c4 100644
--- a/templates/GConf/depends
+++ b/templates/GConf/depends
@@ -1,2 +1,2 @@
-abi_depends=2.26.1
-api_depends=${abi_depends}
+abi_depends=">=2.26.1"
+api_depends="${abi_depends}"
diff --git a/templates/MesaLib/depends b/templates/MesaLib/depends
index a34e2435e71..b34f20ba61a 100644
--- a/templates/MesaLib/depends
+++ b/templates/MesaLib/depends
@@ -1,2 +1,2 @@
-abi_depends=7.3
-api_depends=${abi_depends}
+abi_depends=">=7.3"
+api_depends="${abi_depends}"
diff --git a/templates/MesaLib/template b/templates/MesaLib/template
index 877d8d7e73c..2b4bd61d6d3 100644
--- a/templates/MesaLib/template
+++ b/templates/MesaLib/template
@@ -18,7 +18,7 @@ long_desc="
 subpackages="devel"
 Add_dependency build pkg-config
 Add_dependency build glproto
-Add_dependency build dri2proto 2.1
+Add_dependency build dri2proto	">=2.1"
 Add_dependency build makedepend
 Add_dependency full glibc
 Add_dependency full expat
diff --git a/templates/ORBit2/depends b/templates/ORBit2/depends
index 22bd5371659..8aed219761c 100644
--- a/templates/ORBit2/depends
+++ b/templates/ORBit2/depends
@@ -1,2 +1,2 @@
-abi_depends=2.14.17
-api_depends=${abi_depends}
+abi_depends=">=2.14.17"
+api_depends="${abi_depends}"
diff --git a/templates/PolicyKit/depends b/templates/PolicyKit/depends
index 6a645e94484..1e7ac303992 100644
--- a/templates/PolicyKit/depends
+++ b/templates/PolicyKit/depends
@@ -1,2 +1,2 @@
-abi_depends=0.9
-api_depends=${abi_depends}
+abi_depends=">=0.9"
+api_depends="${abi_depends}"
diff --git a/templates/Thunar/depends b/templates/Thunar/depends
index 75259deb327..0dcb50045fd 100644
--- a/templates/Thunar/depends
+++ b/templates/Thunar/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.1
-api_depends=${abi_depends}
+abi_depends=">=1.0.1"
+api_depends="${abi_depends}"
diff --git a/templates/acl/depends b/templates/acl/depends
index fe13a4179fa..bcf2cf6696b 100644
--- a/templates/acl/depends
+++ b/templates/acl/depends
@@ -1,2 +1,2 @@
-abi_depends=2.2.47
-api_depends=${abi_depends}
+abi_depends=">=2.2.47"
+api_depends="${abi_depends}"
diff --git a/templates/alsa-lib/depends b/templates/alsa-lib/depends
index 7387679acda..1572c0e89f0 100644
--- a/templates/alsa-lib/depends
+++ b/templates/alsa-lib/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.20
-api_depends=${abi_depends}
+abi_depends=">=1.0.20"
+api_depends="${abi_depends}"
diff --git a/templates/aspell/depends b/templates/aspell/depends
index 3cfb496cbbe..874dd8e07cb 100644
--- a/templates/aspell/depends
+++ b/templates/aspell/depends
@@ -1,2 +1,2 @@
-abi_depends=0.60
-api_depends=${abi_depends}
+abi_depends=">=0.60"
+api_depends="${abi_depends}"
diff --git a/templates/atk/depends b/templates/atk/depends
index 7a71c7a534d..6af7195b6ad 100644
--- a/templates/atk/depends
+++ b/templates/atk/depends
@@ -1,2 +1,2 @@
-abi_depends=1.26.0
-api_depends=${abi_depends}
+abi_depends=">=1.26.0"
+api_depends="${abi_depends}"
diff --git a/templates/attr/depends b/templates/attr/depends
index b0dcfdf464b..b5f42b90ec3 100644
--- a/templates/attr/depends
+++ b/templates/attr/depends
@@ -1,2 +1,2 @@
-abi_depends=2.4.43
-api_depends=${abi_depends}
+abi_depends=">=2.4.43"
+api_depends="${abi_depends}"
diff --git a/templates/aufs2-kmod/template b/templates/aufs2-kmod/template
index b6d19d846b7..8115e99f64f 100644
--- a/templates/aufs2-kmod/template
+++ b/templates/aufs2-kmod/template
@@ -11,8 +11,8 @@ long_desc="
  This packages provides the kernel module for aufs2, another unionfs
  implementation for the Linux kernel."
 
-Add_dependency run	kernel		2.6.31.2_1
-Add_dependency build	kernel-headers	2.6.31.2_1
+Add_dependency run	kernel		"-2.6.31.2_1"
+Add_dependency build	kernel-headers	"-2.6.31.2_1"
 
 do_install()
 {
@@ -31,7 +31,7 @@ do_install()
 		config.mk || return 1
 
 	_kver=$(basename /usr/src/kernel-headers*)
-	kver=$(xbps-pkgdb getpkgversion ${_kver})
+	kver=$(${XBPS_PKGDB_CMD} getpkgversion ${_kver})
 	make KDIR=/usr/src/kernel-headers-${kver} || return 1
 	install -D -m644 fs/aufs/aufs.ko \
 		${DESTDIR}/lib/modules/${kver}/kernel/fs/aufs/aufs.ko \
diff --git a/templates/automake/template b/templates/automake/template
index f1af3dcad56..21e457f03eb 100644
--- a/templates/automake/template
+++ b/templates/automake/template
@@ -15,6 +15,6 @@ long_desc="
  dependency tracking support, the use of GNU make is also required."
 
 noarch=yes
-Add_dependency full autoconf 2.60
+Add_dependency full autoconf	">=2.60"
 Add_dependency full libtool
 Add_dependency build texinfo
diff --git a/templates/babl/depends b/templates/babl/depends
index 354297d2f68..43750f0fcba 100644
--- a/templates/babl/depends
+++ b/templates/babl/depends
@@ -1,2 +1,2 @@
-abi_depends=0.0.22
-api_depends=${abi_depends}
+abi_depends=">=0.0.22"
+api_depends="${abi_depends}"
diff --git a/templates/binutils/depends b/templates/binutils/depends
index e877967f3c7..f1429dbc703 100644
--- a/templates/binutils/depends
+++ b/templates/binutils/depends
@@ -1,2 +1,2 @@
-abi_depends=2.18
-api_depends=${abi_depends}
+abi_depends=">=2.18"
+api_depends="${abi_depends}"
diff --git a/templates/bzip2/depends b/templates/bzip2/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/bzip2/depends
+++ b/templates/bzip2/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/cairo/depends b/templates/cairo/depends
index 98c9e30a4a7..2aebfce1ea8 100644
--- a/templates/cairo/depends
+++ b/templates/cairo/depends
@@ -1,2 +1,2 @@
-abi_depends=1.8.6
-api_depends=${abi_depends}
+abi_depends=">=1.8.6"
+api_depends="${abi_depends}"
diff --git a/templates/cdparanoia/depends b/templates/cdparanoia/depends
index dd80deb615d..ec4753951de 100644
--- a/templates/cdparanoia/depends
+++ b/templates/cdparanoia/depends
@@ -1,2 +1,2 @@
-abi_depends=10.2
-api_depends=${abi_depends}
+abi_depends=">=10.2"
+api_depends="${abi_depends}"
diff --git a/templates/cracklib/depends b/templates/cracklib/depends
index f7d5496ceba..f0b94b13893 100644
--- a/templates/cracklib/depends
+++ b/templates/cracklib/depends
@@ -1,2 +1,2 @@
-abi_depends=2.8.0
-api_depends=${abi_depends}
+abi_depends=">=2.8.0"
+api_depends="${abi_depends}"
diff --git a/templates/curl/depends b/templates/curl/depends
index bef47034a24..b71ac337377 100644
--- a/templates/curl/depends
+++ b/templates/curl/depends
@@ -1,2 +1,2 @@
-abi_depends=7.19
-api_depends=${abi_depends}
+abi_depends=">=7.19"
+api_depends="${abi_depends}"
diff --git a/templates/db/depends b/templates/db/depends
index 50cc138bec4..9ce16c57919 100644
--- a/templates/db/depends
+++ b/templates/db/depends
@@ -1,2 +1,2 @@
-abi_depends=4.8.24
-api_depends=${abi_depends}
+abi_depends=">=4.8.24"
+api_depends="${abi_depends}"
diff --git a/templates/dbus-glib/depends b/templates/dbus-glib/depends
index cfd1cfc62c3..42cbb3f1e62 100644
--- a/templates/dbus-glib/depends
+++ b/templates/dbus-glib/depends
@@ -1,2 +1,2 @@
-abi_depends=0.80
-api_depends=${abi_depends}
+abi_depends=">=0.80"
+api_depends="${abi_depends}"
diff --git a/templates/dbus/depends b/templates/dbus/depends
index 9aace47c06d..a24e33ec004 100644
--- a/templates/dbus/depends
+++ b/templates/dbus/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.10
-api_depends=${abi_depends}
+abi_depends=">=1.2.10"
+api_depends="${abi_depends}"
diff --git a/templates/e2fsprogs/depends b/templates/e2fsprogs/depends
index fd5980f7863..45fed374c99 100644
--- a/templates/e2fsprogs/depends
+++ b/templates/e2fsprogs/depends
@@ -1,2 +1,2 @@
-abi_depends=1.41.5_1
-api_depends=${abi_depends}
+abi_depends=">=1.41.5_1"
+api_depends="${abi_depends}"
diff --git a/templates/enchant/depends b/templates/enchant/depends
index d5ac92c8549..d4db4c87cf2 100644
--- a/templates/enchant/depends
+++ b/templates/enchant/depends
@@ -1,2 +1,2 @@
-abi_depends=1.4.2
-api_depends=${abi_depends}
+abi_depends=">=1.4.2"
+api_depends="${abi_depends}"
diff --git a/templates/exo/depends b/templates/exo/depends
index 20b34702076..b9dd7a185c1 100644
--- a/templates/exo/depends
+++ b/templates/exo/depends
@@ -1,2 +1,2 @@
-abi_depends=0.3.101
-api_depends=${abi_depends}
+abi_depends=">=0.3.101"
+api_depends="${abi_depends}"
diff --git a/templates/expat/depends b/templates/expat/depends
index 3c7b0e4f5b5..fb63eee7d05 100644
--- a/templates/expat/depends
+++ b/templates/expat/depends
@@ -1,2 +1,2 @@
-abi_depends=2.0.0
-api_depends=${abi_depends}
+abi_depends=">=2.0.0"
+api_depends="${abi_depends}"
diff --git a/templates/file/depends b/templates/file/depends
index 6983d7570d4..9c5ab9f67e6 100644
--- a/templates/file/depends
+++ b/templates/file/depends
@@ -1,2 +1,2 @@
-abi_depends=4.90
-api_depends=${abi_depends}
+abi_depends=">=4.90"
+api_depends="${abi_depends}"
diff --git a/templates/fontconfig/depends b/templates/fontconfig/depends
index 003c94e8c9b..4fefeafec71 100644
--- a/templates/fontconfig/depends
+++ b/templates/fontconfig/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.0
-api_depends=${abi_depends}
+abi_depends=">=2.6.0"
+api_depends="${abi_depends}"
diff --git a/templates/freetype/depends b/templates/freetype/depends
index ce29601a746..46345ccf787 100644
--- a/templates/freetype/depends
+++ b/templates/freetype/depends
@@ -1,2 +1,2 @@
-abi_depends=2.3.9
-api_depends=${abi_depends}
+abi_depends=">=2.3.9"
+api_depends="${abi_depends}"
diff --git a/templates/gamin/depends b/templates/gamin/depends
index 0298e7588c7..f848c13276e 100644
--- a/templates/gamin/depends
+++ b/templates/gamin/depends
@@ -1,2 +1,2 @@
-abi_depends=0.1.9
-api_depends=${abi_depends}
+abi_depends=">=0.1.9"
+api_depends="${abi_depends}"
diff --git a/templates/gcc/depends b/templates/gcc/depends
index c2e05574e76..e40ee2b41a4 100644
--- a/templates/gcc/depends
+++ b/templates/gcc/depends
@@ -1,2 +1,2 @@
-abi_depends=4.4.0
-api_depends=${abi_depends}
+abi_depends=">=4.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/gd/depends b/templates/gd/depends
index e89ee473cca..7814dba7747 100644
--- a/templates/gd/depends
+++ b/templates/gd/depends
@@ -1,2 +1,2 @@
-abi_depends=2.0.35
-api_depends=${abi_depends}
+abi_depends=">=2.0.35"
+api_depends="${abi_depends}"
diff --git a/templates/gdbm/depends b/templates/gdbm/depends
index c239b6b5b7b..e6315a04251 100644
--- a/templates/gdbm/depends
+++ b/templates/gdbm/depends
@@ -1,2 +1,2 @@
-abi_depends=1.8.0
-api_depends=${abi_depends}
+abi_depends=">=1.8.0"
+api_depends="${abi_depends}"
diff --git a/templates/gegl/depends b/templates/gegl/depends
index 354297d2f68..43750f0fcba 100644
--- a/templates/gegl/depends
+++ b/templates/gegl/depends
@@ -1,2 +1,2 @@
-abi_depends=0.0.22
-api_depends=${abi_depends}
+abi_depends=">=0.0.22"
+api_depends="${abi_depends}"
diff --git a/templates/gettext/depends b/templates/gettext/depends
index 9ddbd41545b..552b83e8f55 100644
--- a/templates/gettext/depends
+++ b/templates/gettext/depends
@@ -1,2 +1,2 @@
-abi_depends=0.17
-api_depends=${abi_depends}
+abi_depends=">=0.17"
+api_depends="${abi_depends}"
diff --git a/templates/gimp/depends b/templates/gimp/depends
index 274d2cf04be..b7d8ad23d64 100644
--- a/templates/gimp/depends
+++ b/templates/gimp/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.6
-api_depends=${abi_depends}
+abi_depends=">=2.6.6"
+api_depends="${abi_depends}"
diff --git a/templates/glib/depends b/templates/glib/depends
index 5eecb8d889b..86df3b1e32a 100644
--- a/templates/glib/depends
+++ b/templates/glib/depends
@@ -1,2 +1,2 @@
-abi_depends=2.18.0
-api_depends=${abi_depends}
+abi_depends=">=2.18.0"
+api_depends="${abi_depends}"
diff --git a/templates/glibc/depends b/templates/glibc/depends
index 2bdfdafe52d..e12218f87a7 100644
--- a/templates/glibc/depends
+++ b/templates/glibc/depends
@@ -1,2 +1,2 @@
-abi_depends=2.8
-api_depends=${abi_depends}
+abi_depends=">=2.8"
+api_depends="${abi_depends}"
diff --git a/templates/glitz/depends b/templates/glitz/depends
index ae1d2e93302..30c41265373 100644
--- a/templates/glitz/depends
+++ b/templates/glitz/depends
@@ -1,2 +1,2 @@
-abi_depends=0.5.6
-api_depends=${abi_depends}
+abi_depends=">=0.5.6"
+api_depends="${abi_depends}"
diff --git a/templates/gmp/depends b/templates/gmp/depends
index 300b32091e0..580ada7b508 100644
--- a/templates/gmp/depends
+++ b/templates/gmp/depends
@@ -1,2 +1,2 @@
-abi_depends=4.2.2
-api_depends=${abi_depends}
+abi_depends=">=4.2.2"
+api_depends="${abi_depends}"
diff --git a/templates/gnutls/depends b/templates/gnutls/depends
index 274d2cf04be..b7d8ad23d64 100644
--- a/templates/gnutls/depends
+++ b/templates/gnutls/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.6
-api_depends=${abi_depends}
+abi_depends=">=2.6.6"
+api_depends="${abi_depends}"
diff --git a/templates/grub2/devel.template b/templates/grub2/devel.template
index b6b7950291d..a383f9b0829 100644
--- a/templates/grub2/devel.template
+++ b/templates/grub2/devel.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-Add_dependency run grub2 ${version}
+Add_dependency run grub2 ">=${version}"
 
 do_install()
 {
diff --git a/templates/gst-plugins-base/depends b/templates/gst-plugins-base/depends
index 96ef71f1b58..a1159ffe4cd 100644
--- a/templates/gst-plugins-base/depends
+++ b/templates/gst-plugins-base/depends
@@ -1,2 +1,2 @@
-abi_depends=0.10.22
-api_depends=${abi_depends}
+abi_depends=">=0.10.22"
+api_depends="${abi_depends}"
diff --git a/templates/gstreamer/depends b/templates/gstreamer/depends
index 96ef71f1b58..a1159ffe4cd 100644
--- a/templates/gstreamer/depends
+++ b/templates/gstreamer/depends
@@ -1,2 +1,2 @@
-abi_depends=0.10.22
-api_depends=${abi_depends}
+abi_depends=">=0.10.22"
+api_depends="${abi_depends}"
diff --git a/templates/gtk+/depends b/templates/gtk+/depends
index 551cadd4d95..bd368daa0e8 100644
--- a/templates/gtk+/depends
+++ b/templates/gtk+/depends
@@ -1,2 +1,2 @@
-abi_depends=2.16.0
-api_depends=${abi_depends}
+abi_depends=">=2.16.0"
+api_depends="${abi_depends}"
diff --git a/templates/hal/depends b/templates/hal/depends
index 9fb672978f2..a14ad089570 100644
--- a/templates/hal/depends
+++ b/templates/hal/depends
@@ -1,2 +1,2 @@
-abi_depends=0.5.11
-api_depends=${abi_depends}
+abi_depends=">=0.5.11"
+api_depends="${abi_depends}"
diff --git a/templates/hunspell/depends b/templates/hunspell/depends
index 76acccdb982..28c1ca45141 100644
--- a/templates/hunspell/depends
+++ b/templates/hunspell/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.8
-api_depends=${abi_depends}
+abi_depends=">=1.2.8"
+api_depends="${abi_depends}"
diff --git a/templates/icu/depends b/templates/icu/depends
index f62b874fe70..a73444d7334 100644
--- a/templates/icu/depends
+++ b/templates/icu/depends
@@ -1,2 +1,2 @@
-abi_depends=4.2
-api_depends=${abi_depends}
+abi_depends=">=4.2"
+api_depends="${abi_depends}"
diff --git a/templates/jasper/depends b/templates/jasper/depends
index 0aab3797533..54a71bf9cb4 100644
--- a/templates/jasper/depends
+++ b/templates/jasper/depends
@@ -1,2 +1,2 @@
-abi_depends=1.900.1
-api_depends=${abi_depends}
+abi_depends=">=1.900.1"
+api_depends="${abi_depends}"
diff --git a/templates/jpeg/depends b/templates/jpeg/depends
index a8d61062b81..c7f5401427d 100644
--- a/templates/jpeg/depends
+++ b/templates/jpeg/depends
@@ -1,2 +1,2 @@
-abi_depends=7
-api_depends=${abi_depends}
+abi_depends=">=7"
+api_depends="${abi_depends}"
diff --git a/templates/kernel/template b/templates/kernel/template
index 5902d311865..f4f54c79b34 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -22,7 +22,7 @@ Add_dependency full dash
 Add_dependency full coreutils
 Add_dependency full module-init-tools
 Add_dependency run initramfs-tools
-Add_dependency run kernel-firmware ${_kernel_ver}
+Add_dependency run kernel-firmware ">=${_kernel_ver}"
 Add_dependency build perl
 
 do_install()
diff --git a/templates/klibc/depends b/templates/klibc/depends
index be2fb711d4b..d284ebb38a9 100644
--- a/templates/klibc/depends
+++ b/templates/klibc/depends
@@ -1,2 +1,2 @@
-abi_depends=1.5.14
-api_depends=${abi_depends}
+abi_depends=">=1.5.14"
+api_depends="${abi_depends}"
diff --git a/templates/klibc/template b/templates/klibc/template
index e9d2cc6a828..951e3844b10 100644
--- a/templates/klibc/template
+++ b/templates/klibc/template
@@ -21,7 +21,7 @@ Add_dependency build perl
 
 pre_build()
 {
-	local kver="$(xbps-pkgdb version kernel-headers)"
+	local kver="$(${XBPS_PKGDB_CMD} version kernel-headers)"
 
 	cd $wrksrc || return 1
 	ln -s /usr/src/kernel-headers-$kver linux
diff --git a/templates/lcms/depends b/templates/lcms/depends
index 496fbe6576d..27bbe1afc5a 100644
--- a/templates/lcms/depends
+++ b/templates/lcms/depends
@@ -1,2 +1,2 @@
-abi_depends=1.18
-api_depends=${abi_depends}
+abi_depends=">=1.18"
+api_depends="${abi_depends}"
diff --git a/templates/libICE/depends b/templates/libICE/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/libICE/depends
+++ b/templates/libICE/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/libIDL/depends b/templates/libIDL/depends
index 01dfb8aeaff..eacf465f5b2 100644
--- a/templates/libIDL/depends
+++ b/templates/libIDL/depends
@@ -1,2 +1,2 @@
-abi_depends=0.8.13
-api_depends=${abi_depends}
+abi_depends=">=0.8.13"
+api_depends="${abi_depends}"
diff --git a/templates/libSM/depends b/templates/libSM/depends
index 6951c6b567e..7d08e28214d 100644
--- a/templates/libSM/depends
+++ b/templates/libSM/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.0
-api_depends=${abi_depends}
+abi_depends=">=1.1.0"
+api_depends="${abi_depends}"
diff --git a/templates/libX11/depends b/templates/libX11/depends
index 80ce1443c5b..69d34d38dfe 100644
--- a/templates/libX11/depends
+++ b/templates/libX11/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2
-api_depends=${abi_depends}
+abi_depends=">=1.2"
+api_depends="${abi_depends}"
diff --git a/templates/libXScrnSaver/depends b/templates/libXScrnSaver/depends
index 981eb3f1e5a..c4deeecfc66 100644
--- a/templates/libXScrnSaver/depends
+++ b/templates/libXScrnSaver/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.3
-api_depends=${abi_depends}
+abi_depends=">=1.1.3"
+api_depends="${abi_depends}"
diff --git a/templates/libXau/depends b/templates/libXau/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libXau/depends
+++ b/templates/libXau/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXaw/depends b/templates/libXaw/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/libXaw/depends
+++ b/templates/libXaw/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/libXcomposite/depends b/templates/libXcomposite/depends
index a2df9c5bb0b..7855591013a 100644
--- a/templates/libXcomposite/depends
+++ b/templates/libXcomposite/depends
@@ -1,2 +1,2 @@
-abi_depends=0.4.0
-api_depends=${abi_depends}
+abi_depends=">=0.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/libXcursor/depends b/templates/libXcursor/depends
index 37d37d6ec2e..68ae22f7f6d 100644
--- a/templates/libXcursor/depends
+++ b/templates/libXcursor/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.9
-api_depends=${abi_depends}
+abi_depends=">=1.1.9"
+api_depends="${abi_depends}"
diff --git a/templates/libXdamage/depends b/templates/libXdamage/depends
index b07259c7685..328eed9225b 100644
--- a/templates/libXdamage/depends
+++ b/templates/libXdamage/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.1
-api_depends=${abi_depends}
+abi_depends=">=1.1.1"
+api_depends="${abi_depends}"
diff --git a/templates/libXdmcp/depends b/templates/libXdmcp/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libXdmcp/depends
+++ b/templates/libXdmcp/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libXevie/depends b/templates/libXevie/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libXevie/depends
+++ b/templates/libXevie/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libXext/depends b/templates/libXext/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/libXext/depends
+++ b/templates/libXext/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/libXfixes/depends b/templates/libXfixes/depends
index 42d0a3db998..3fa9b8a8d6c 100644
--- a/templates/libXfixes/depends
+++ b/templates/libXfixes/depends
@@ -1,2 +1,2 @@
-abi_depends=4.0.3
-api_depends=${abi_depends}
+abi_depends=">=4.0.3"
+api_depends="${abi_depends}"
diff --git a/templates/libXfont/depends b/templates/libXfont/depends
index f1de44d64f5..fd55a5e3473 100644
--- a/templates/libXfont/depends
+++ b/templates/libXfont/depends
@@ -1,2 +1,2 @@
-abi_depends=1.4.0
-api_depends=${abi_depends}
+abi_depends=">=1.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/libXfontcache/depends b/templates/libXfontcache/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libXfontcache/depends
+++ b/templates/libXfontcache/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXft/depends b/templates/libXft/depends
index a5fe45e3693..8bf8955c7ec 100644
--- a/templates/libXft/depends
+++ b/templates/libXft/depends
@@ -1,2 +1,2 @@
-abi_depends=2.1.13
-api_depends=${abi_depends}
+abi_depends=">=2.1.13"
+api_depends="${abi_depends}"
diff --git a/templates/libXi/depends b/templates/libXi/depends
index 911b41c266d..b14f99034b8 100644
--- a/templates/libXi/depends
+++ b/templates/libXi/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.1
-api_depends=${abi_depends}
+abi_depends=">=1.2.1"
+api_depends="${abi_depends}"
diff --git a/templates/libXinerama/depends b/templates/libXinerama/depends
index e9365df6371..8a3f27e0b73 100644
--- a/templates/libXinerama/depends
+++ b/templates/libXinerama/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"
diff --git a/templates/libXmu/depends b/templates/libXmu/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libXmu/depends
+++ b/templates/libXmu/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXp/depends b/templates/libXp/depends
index 9ff7c35b09d..a66f7dfdeb8 100644
--- a/templates/libXp/depends
+++ b/templates/libXp/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.0
-api_depends=${abi_depends}
+abi_depends=">=1.0.0"
+api_depends="${abi_depends}"
diff --git a/templates/libXpm/depends b/templates/libXpm/depends
index b4310676f3d..6b77038e3f7 100644
--- a/templates/libXpm/depends
+++ b/templates/libXpm/depends
@@ -1,2 +1,2 @@
-abi_depends=3.5.7
-api_depends=${abi_depends}
+abi_depends=">=3.5.7"
+api_depends="${abi_depends}"
diff --git a/templates/libXrandr/depends b/templates/libXrandr/depends
index 3f96ca02169..c2fc823f30f 100644
--- a/templates/libXrandr/depends
+++ b/templates/libXrandr/depends
@@ -1,2 +1,2 @@
-abi_depends=1.3.0
-api_depends=${abi_depends}
+abi_depends=">=1.3.0"
+api_depends="${abi_depends}"
diff --git a/templates/libXrender/depends b/templates/libXrender/depends
index 95fa9c3af5d..82f41d94341 100644
--- a/templates/libXrender/depends
+++ b/templates/libXrender/depends
@@ -1,2 +1,2 @@
-abi_depends=0.9.4
-api_depends=${abi_depends}
+abi_depends=">=0.9.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXres/depends b/templates/libXres/depends
index e9365df6371..8a3f27e0b73 100644
--- a/templates/libXres/depends
+++ b/templates/libXres/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"
diff --git a/templates/libXt/depends b/templates/libXt/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/libXt/depends
+++ b/templates/libXt/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/libXtst/depends b/templates/libXtst/depends
index e9365df6371..8a3f27e0b73 100644
--- a/templates/libXtst/depends
+++ b/templates/libXtst/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.3
-api_depends=${abi_depends}
+abi_depends=">=1.0.3"
+api_depends="${abi_depends}"
diff --git a/templates/libXv/depends b/templates/libXv/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libXv/depends
+++ b/templates/libXv/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXvMC/depends b/templates/libXvMC/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libXvMC/depends
+++ b/templates/libXvMC/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libXxf86dga/depends b/templates/libXxf86dga/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libXxf86dga/depends
+++ b/templates/libXxf86dga/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libXxf86misc/depends b/templates/libXxf86misc/depends
index 75259deb327..0dcb50045fd 100644
--- a/templates/libXxf86misc/depends
+++ b/templates/libXxf86misc/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.1
-api_depends=${abi_depends}
+abi_depends=">=1.0.1"
+api_depends="${abi_depends}"
diff --git a/templates/libXxf86vm/depends b/templates/libXxf86vm/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libXxf86vm/depends
+++ b/templates/libXxf86vm/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libarchive/depends b/templates/libarchive/depends
index 003c94e8c9b..4fefeafec71 100644
--- a/templates/libarchive/depends
+++ b/templates/libarchive/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.0
-api_depends=${abi_depends}
+abi_depends=">=2.6.0"
+api_depends="${abi_depends}"
diff --git a/templates/libart/depends b/templates/libart/depends
index fa0775226bf..1f4d7e012e2 100644
--- a/templates/libart/depends
+++ b/templates/libart/depends
@@ -1,2 +1,2 @@
-abi_depends=2.3.20
-api_depends=${abi_depends}
+abi_depends=">=2.3.20"
+api_depends="${abi_depends}"
diff --git a/templates/libblkid/depends b/templates/libblkid/depends
index df5c394aa38..024cc3e8ddb 100644
--- a/templates/libblkid/depends
+++ b/templates/libblkid/depends
@@ -1,2 +1,2 @@
-abi_depends=2.15
-api_depends=${abi_depends}
+abi_depends=">=2.15"
+api_depends="${abi_depends}"
diff --git a/templates/libcap/depends b/templates/libcap/depends
index e82f7596f6b..9c30304b060 100644
--- a/templates/libcap/depends
+++ b/templates/libcap/depends
@@ -1,2 +1,2 @@
-abi_depends=2.16
-api_depends=${abi_depends}
+abi_depends=">=2.16"
+api_depends="${abi_depends}"
diff --git a/templates/libcroco/depends b/templates/libcroco/depends
index f0f053c2a3f..bc8055c04c6 100644
--- a/templates/libcroco/depends
+++ b/templates/libcroco/depends
@@ -1,2 +1,2 @@
-abi_depends=0.6.2
-api_depends=${abi_depends}
+abi_depends=">=0.6.2"
+api_depends="${abi_depends}"
diff --git a/templates/libdmx/depends b/templates/libdmx/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libdmx/depends
+++ b/templates/libdmx/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libdrm/depends b/templates/libdrm/depends
index 7fbf23ef48a..1c37093bdf2 100644
--- a/templates/libdrm/depends
+++ b/templates/libdrm/depends
@@ -1,2 +1,2 @@
-abi_depends=2.4.6
-api_depends=${abi_depends}
+abi_depends=">=2.4.6"
+api_depends="${abi_depends}"
diff --git a/templates/libevent/depends b/templates/libevent/depends
index cf26dbde8bd..fb0ab0a7dc8 100644
--- a/templates/libevent/depends
+++ b/templates/libevent/depends
@@ -1,2 +1,2 @@
-abi_depends=1.4.9
-api_depends=${abi_depends}
+abi_depends=">=1.4.9"
+api_depends="${abi_depends}"
diff --git a/templates/libexif/depends b/templates/libexif/depends
index 2b383b25cf3..1a5211fe01e 100644
--- a/templates/libexif/depends
+++ b/templates/libexif/depends
@@ -1,2 +1,2 @@
-abi_depends=0.6.17
-api_depends=${abi_depends}
+abi_depends=">=0.6.17"
+api_depends="${abi_depends}"
diff --git a/templates/libfontenc/depends b/templates/libfontenc/depends
index 9dbd85baa2a..dc58176dfd3 100644
--- a/templates/libfontenc/depends
+++ b/templates/libfontenc/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.4
-api_depends=${abi_depends}
+abi_depends=">=1.0.4"
+api_depends="${abi_depends}"
diff --git a/templates/libgcrypt/depends b/templates/libgcrypt/depends
index 1e225b0efc9..db6180d368d 100644
--- a/templates/libgcrypt/depends
+++ b/templates/libgcrypt/depends
@@ -1,2 +1,2 @@
-abi_depends=1.4.4
-api_depends=${abi_depends}
+abi_depends=">=1.4.4"
+api_depends="${abi_depends}"
diff --git a/templates/libglade/depends b/templates/libglade/depends
index b1dc709d023..4b59a956dbf 100644
--- a/templates/libglade/depends
+++ b/templates/libglade/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.4
-api_depends=${abi_depends}
+abi_depends=">=2.6.4"
+api_depends="${abi_depends}"
diff --git a/templates/libgpg-error/depends b/templates/libgpg-error/depends
index b8bebe468c0..58213312e10 100644
--- a/templates/libgpg-error/depends
+++ b/templates/libgpg-error/depends
@@ -1,2 +1,2 @@
-abi_depends=1.6
-api_depends=${abi_depends}
+abi_depends=">=1.6"
+api_depends="${abi_depends}"
diff --git a/templates/libgsf/depends b/templates/libgsf/depends
index 98be5fb622a..4067ffdd00f 100644
--- a/templates/libgsf/depends
+++ b/templates/libgsf/depends
@@ -1,2 +1,2 @@
-abi_depends=1.14.11
-api_depends=${abi_depends}
+abi_depends=">=1.14.11"
+api_depends="${abi_depends}"
diff --git a/templates/libidn/depends b/templates/libidn/depends
index 9ab20982f6c..4edb2fea971 100644
--- a/templates/libidn/depends
+++ b/templates/libidn/depends
@@ -1,2 +1,2 @@
-abi_depends=1.10
-api_depends=${abi_depends}
+abi_depends=">=1.10"
+api_depends="${abi_depends}"
diff --git a/templates/libmng/depends b/templates/libmng/depends
index 8f870118556..03d7b541e74 100644
--- a/templates/libmng/depends
+++ b/templates/libmng/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.10
-api_depends=${abi_depends}
+abi_depends=">=1.0.10"
+api_depends="${abi_depends}"
diff --git a/templates/libnl/depends b/templates/libnl/depends
index 744a52c574c..19862a1b53e 100644
--- a/templates/libnl/depends
+++ b/templates/libnl/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1
-api_depends=${abi_depends}
+abi_depends=">=1.1"
+api_depends="${abi_depends}"
diff --git a/templates/libnotify/depends b/templates/libnotify/depends
index 0aa84cdb382..39494e38104 100644
--- a/templates/libnotify/depends
+++ b/templates/libnotify/depends
@@ -1,2 +1,2 @@
-abi_depends=0.4.5
-api_depends=${abi_depends}
+abi_depends=">=0.4.5"
+api_depends="${abi_depends}"
diff --git a/templates/libogg/depends b/templates/libogg/depends
index 981eb3f1e5a..c4deeecfc66 100644
--- a/templates/libogg/depends
+++ b/templates/libogg/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.3
-api_depends=${abi_depends}
+abi_depends=">=1.1.3"
+api_depends="${abi_depends}"
diff --git a/templates/liboil/depends b/templates/liboil/depends
index 16316c4bcd7..bffe43bccea 100644
--- a/templates/liboil/depends
+++ b/templates/liboil/depends
@@ -1,2 +1,2 @@
-abi_depends=0.3.16
-api_depends=${abi_depends}
+abi_depends=">=0.3.16"
+api_depends="${abi_depends}"
diff --git a/templates/libpciaccess/depends b/templates/libpciaccess/depends
index 1aeb3c5ee02..fc0b110871a 100644
--- a/templates/libpciaccess/depends
+++ b/templates/libpciaccess/depends
@@ -1,2 +1,2 @@
-abi_depends=0.10.5
-api_depends=${abi_depends}
+abi_depends=">=0.10.5"
+api_depends="${abi_depends}"
diff --git a/templates/libpng/depends b/templates/libpng/depends
index 1ff538d6470..9c01583bcdd 100644
--- a/templates/libpng/depends
+++ b/templates/libpng/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.35
-api_depends=${abi_depends}
+abi_depends=">=1.2.35"
+api_depends="${abi_depends}"
diff --git a/templates/libproxy/depends b/templates/libproxy/depends
index 3ee948c43bf..6ef2aa1c6b4 100644
--- a/templates/libproxy/depends
+++ b/templates/libproxy/depends
@@ -1,2 +1,2 @@
-abi_depends=0.2.3
-api_depends=${abi_depends}
+abi_depends=">=0.2.3"
+api_depends="${abi_depends}"
diff --git a/templates/librsvg/depends b/templates/librsvg/depends
index 5293d769dd7..ab4f4ae157f 100644
--- a/templates/librsvg/depends
+++ b/templates/librsvg/depends
@@ -1,2 +1,2 @@
-abi_depends=2.26.0
-api_depends=${abi_depends}
+abi_depends=">=2.26.0"
+api_depends="${abi_depends}"
diff --git a/templates/libsmbios/depends b/templates/libsmbios/depends
index 718a0464ae6..ebf58db9fb1 100644
--- a/templates/libsmbios/depends
+++ b/templates/libsmbios/depends
@@ -1,2 +1,2 @@
-abi_depends=2.2.14
-api_depends=${abi_depends}
+abi_depends=">=2.2.14"
+api_depends="${abi_depends}"
diff --git a/templates/libsoup/depends b/templates/libsoup/depends
index 52ba257fe89..a3fd0750ce2 100644
--- a/templates/libsoup/depends
+++ b/templates/libsoup/depends
@@ -1,2 +1,2 @@
-abi_depends=2.27.5
-api_depends=${abi_depends}
+abi_depends=">=2.27.5"
+api_depends="${abi_depends}"
diff --git a/templates/libtasn1/depends b/templates/libtasn1/depends
index 866ffda4b7d..012b7194eeb 100644
--- a/templates/libtasn1/depends
+++ b/templates/libtasn1/depends
@@ -1,2 +1,2 @@
-abi_depends=2.1
-api_depends=${abi_depends}
+abi_depends=">=2.1"
+api_depends="${abi_depends}"
diff --git a/templates/libtheora/depends b/templates/libtheora/depends
index 4925a27ac54..bb0044e6e3b 100644
--- a/templates/libtheora/depends
+++ b/templates/libtheora/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0
-api_depends=${abi_depends}
+abi_depends=">=1.0"
+api_depends="${abi_depends}"
diff --git a/templates/libtool/depends b/templates/libtool/depends
index 9f9d31dfe30..dcf92fe6ff2 100644
--- a/templates/libtool/depends
+++ b/templates/libtool/depends
@@ -1,2 +1,2 @@
-abi_depends=2.2.6
-api_depends=${abi_depends}
+abi_depends=">=2.2.6"
+api_depends="${abi_depends}"
diff --git a/templates/libunique/depends b/templates/libunique/depends
index fd71138a425..9ee6dd9885e 100644
--- a/templates/libunique/depends
+++ b/templates/libunique/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.8
-api_depends=${abi_depends}
+abi_depends=">=1.0.8"
+api_depends="${abi_depends}"
diff --git a/templates/libusb-compat/depends b/templates/libusb-compat/depends
index c97abcfa45d..140f5aa7a9d 100644
--- a/templates/libusb-compat/depends
+++ b/templates/libusb-compat/depends
@@ -1,2 +1,2 @@
-abi_depends=0.1.0
-api_depends=${abi_depends}
+abi_depends=">=0.1.0"
+api_depends="${abi_depends}"
diff --git a/templates/libusb/depends b/templates/libusb/depends
index 9ff7c35b09d..a66f7dfdeb8 100644
--- a/templates/libusb/depends
+++ b/templates/libusb/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.0
-api_depends=${abi_depends}
+abi_depends=">=1.0.0"
+api_depends="${abi_depends}"
diff --git a/templates/libuuid/depends b/templates/libuuid/depends
index 5c01be9dbe6..58f30e03837 100644
--- a/templates/libuuid/depends
+++ b/templates/libuuid/depends
@@ -1,2 +1,2 @@
-abi_depends=1.41.5
-api_depends=${abi_depends}
+abi_depends=">=1.41.5"
+api_depends="${abi_depends}"
diff --git a/templates/libvisual/depends b/templates/libvisual/depends
index a2df9c5bb0b..7855591013a 100644
--- a/templates/libvisual/depends
+++ b/templates/libvisual/depends
@@ -1,2 +1,2 @@
-abi_depends=0.4.0
-api_depends=${abi_depends}
+abi_depends=">=0.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/libvorbis/depends b/templates/libvorbis/depends
index 74d94d522f3..d56e13c7b33 100644
--- a/templates/libvorbis/depends
+++ b/templates/libvorbis/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.1rc1
-api_depends=${abi_depends}
+abi_depends=">=1.2.1rc1"
+api_depends="${abi_depends}"
diff --git a/templates/libwmf/depends b/templates/libwmf/depends
index 8d218f0b5bb..5a165a753e4 100644
--- a/templates/libwmf/depends
+++ b/templates/libwmf/depends
@@ -1,2 +1,2 @@
-abi_depends=0.2.8.4
-api_depends=${abi_depends}
+abi_depends=">=0.2.8.4"
+api_depends="${abi_depends}"
diff --git a/templates/libwnck/depends b/templates/libwnck/depends
index 0812aac72df..000141419c4 100644
--- a/templates/libwnck/depends
+++ b/templates/libwnck/depends
@@ -1,2 +1,2 @@
-abi_depends=2.26.1
-api_depends=${abi_depends}
+abi_depends=">=2.26.1"
+api_depends="${abi_depends}"
diff --git a/templates/libx86/depends b/templates/libx86/depends
index 744a52c574c..19862a1b53e 100644
--- a/templates/libx86/depends
+++ b/templates/libx86/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1
-api_depends=${abi_depends}
+abi_depends=">=1.1"
+api_depends="${abi_depends}"
diff --git a/templates/libxcb/depends b/templates/libxcb/depends
index 80ce1443c5b..69d34d38dfe 100644
--- a/templates/libxcb/depends
+++ b/templates/libxcb/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2
-api_depends=${abi_depends}
+abi_depends=">=1.2"
+api_depends="${abi_depends}"
diff --git a/templates/libxcb/template b/templates/libxcb/template
index 6ee5f3cda84..3b4e70ab0b4 100644
--- a/templates/libxcb/template
+++ b/templates/libxcb/template
@@ -23,7 +23,7 @@ subpackages="devel"
 Add_dependency build pkg-config
 Add_dependency build python
 Add_dependency build libxslt
-Add_dependency build xcb-proto 1.5
+Add_dependency build xcb-proto ">=1.5"
 Add_dependency full glibc
 Add_dependency full libXdmcp
 Add_dependency full libXau
diff --git a/templates/libxfce4menu/depends b/templates/libxfce4menu/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/libxfce4menu/depends
+++ b/templates/libxfce4menu/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/libxfce4util/depends b/templates/libxfce4util/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/libxfce4util/depends
+++ b/templates/libxfce4util/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/libxfcegui4/depends b/templates/libxfcegui4/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/libxfcegui4/depends
+++ b/templates/libxfcegui4/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/libxkbfile/depends b/templates/libxkbfile/depends
index f847cf49272..66a8f8ac967 100644
--- a/templates/libxkbfile/depends
+++ b/templates/libxkbfile/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.5
-api_depends=${abi_depends}
+abi_depends=">=1.0.5"
+api_depends="${abi_depends}"
diff --git a/templates/libxkbui/depends b/templates/libxkbui/depends
index be05a0beba4..b51be5b0349 100644
--- a/templates/libxkbui/depends
+++ b/templates/libxkbui/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.2
-api_depends=${abi_depends}
+abi_depends=">=1.0.2"
+api_depends="${abi_depends}"
diff --git a/templates/libxklavier/depends b/templates/libxklavier/depends
index 349b5cfbaca..99afd8797d1 100644
--- a/templates/libxklavier/depends
+++ b/templates/libxklavier/depends
@@ -1,2 +1,2 @@
-abi_depends=3.9
-api_depends=${abi_depends}
+abi_depends=">=3.9"
+api_depends="${abi_depends}"
diff --git a/templates/libxml2/depends b/templates/libxml2/depends
index 5c7668b955a..6a7e4eb14d1 100644
--- a/templates/libxml2/depends
+++ b/templates/libxml2/depends
@@ -1,2 +1,2 @@
-abi_depends=2.7.0
-api_depends=${abi_depends}
+abi_depends=">=2.7.0"
+api_depends="${abi_depends}"
diff --git a/templates/libxslt/depends b/templates/libxslt/depends
index 1d709bd2aa4..987f14b5f26 100644
--- a/templates/libxslt/depends
+++ b/templates/libxslt/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.24
-api_depends=${abi_depends}
+abi_depends=">=1.1.24"
+api_depends="${abi_depends}"
diff --git a/templates/lvm2/template b/templates/lvm2/template
index 6ded8eba6ff..9fc48e14d29 100644
--- a/templates/lvm2/template
+++ b/templates/lvm2/template
@@ -32,7 +32,7 @@ openrc_services="lvm2 shutdown"
 Add_dependency full glibc
 Add_dependency full bash
 Add_dependency full readline
-Add_dependency run  lvm2-device-mapper ${version}
+Add_dependency run  lvm2-device-mapper ">=${version}"
 
 post_install()
 {
diff --git a/templates/lzo/depends b/templates/lzo/depends
index 6d128b23d6e..cfb76a01218 100644
--- a/templates/lzo/depends
+++ b/templates/lzo/depends
@@ -1,2 +1,2 @@
-abi_depends=2.03
-api_depends=${abi_depends}
+abi_depends=">=2.03"
+api_depends="${abi_depends}"
diff --git a/templates/mpfr/depends b/templates/mpfr/depends
index 810ac15e6c1..9111495cbc2 100644
--- a/templates/mpfr/depends
+++ b/templates/mpfr/depends
@@ -1,2 +1,2 @@
-abi_depends=2.4.0
-api_depends=${abi_depends}
+abi_depends=">=2.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/ncurses/depends b/templates/ncurses/depends
index 745af2f3ddf..e51aa90cac0 100644
--- a/templates/ncurses/depends
+++ b/templates/ncurses/depends
@@ -1,2 +1,2 @@
-abi_depends=5.6
-api_depends=${abi_depends}
+abi_depends=">=5.6"
+api_depends="${abi_depends}"
diff --git a/templates/nspr/depends b/templates/nspr/depends
index 5b51d131db2..5fb31405357 100644
--- a/templates/nspr/depends
+++ b/templates/nspr/depends
@@ -1,2 +1,2 @@
-abi_depends=4.8
-api_depends=${abi_depends}
+abi_depends=">=4.8"
+api_depends="${abi_depends}"
diff --git a/templates/nss/depends b/templates/nss/depends
index e5110de6d47..8656ca7484c 100644
--- a/templates/nss/depends
+++ b/templates/nss/depends
@@ -1,2 +1,2 @@
-abi_depends=3.12.4
-api_depends=${abi_depends}
+abi_depends=">=3.12.4"
+api_depends="${abi_depends}"
diff --git a/templates/opencdk/depends b/templates/opencdk/depends
index 62766763ed0..d7ba5387561 100644
--- a/templates/opencdk/depends
+++ b/templates/opencdk/depends
@@ -1,2 +1,2 @@
-abi_depends=0.6.6
-api_depends=${abi_depends}
+abi_depends=">=0.6.6"
+api_depends="${abi_depends}"
diff --git a/templates/openssl/depends b/templates/openssl/depends
index 761c51503c9..30287abadfe 100644
--- a/templates/openssl/depends
+++ b/templates/openssl/depends
@@ -1,2 +1,2 @@
-abi_depends=0.9.8
-api_depends=${abi_depends}
+abi_depends=">=0.9.8"
+api_depends="${abi_depends}"
diff --git a/templates/pam/depends b/templates/pam/depends
index 9ff7c35b09d..a66f7dfdeb8 100644
--- a/templates/pam/depends
+++ b/templates/pam/depends
@@ -1,2 +1,2 @@
-abi_depends=1.0.0
-api_depends=${abi_depends}
+abi_depends=">=1.0.0"
+api_depends="${abi_depends}"
diff --git a/templates/pango/depends b/templates/pango/depends
index bc6f698a27b..aa87a2bf91c 100644
--- a/templates/pango/depends
+++ b/templates/pango/depends
@@ -1,2 +1,2 @@
-abi_depends=1.24.0
-api_depends=${abi_depends}
+abi_depends=">=1.24.0"
+api_depends="${abi_depends}"
diff --git a/templates/pciutils/depends b/templates/pciutils/depends
index 0d479301f51..39348cf7031 100644
--- a/templates/pciutils/depends
+++ b/templates/pciutils/depends
@@ -1,2 +1,2 @@
-abi_depends=3.1.2
-api_depends=${abi_depends}
+abi_depends=">=3.1.2"
+api_depends="${abi_depends}"
diff --git a/templates/pcre/depends b/templates/pcre/depends
index fe43c4f9c60..3bc988da7db 100644
--- a/templates/pcre/depends
+++ b/templates/pcre/depends
@@ -1,2 +1,2 @@
-abi_depends=7.8
-api_depends=${abi_depends}
+abi_depends=">=7.8"
+api_depends="${abi_depends}"
diff --git a/templates/perl-Glib/template b/templates/perl-Glib/template
index 6c4f33c8ae5..f4ebb840c7e 100644
--- a/templates/perl-Glib/template
+++ b/templates/perl-Glib/template
@@ -15,7 +15,7 @@ long_desc="
  that make up the Gnome environment, and are used in many unrelated
  projects."
 
-Add_dependency build perl-ExtUtils-Depends 0.300
-Add_dependency build perl-ExtUtils-PkgConfig 1.00
+Add_dependency build perl-ExtUtils-Depends	">=0.300"
+Add_dependency build perl-ExtUtils-PkgConfig	">=1.00"
 Add_dependency full perl
 Add_dependency full glib
diff --git a/templates/perl/depends b/templates/perl/depends
index 6eb5313c1b6..883682de821 100644
--- a/templates/perl/depends
+++ b/templates/perl/depends
@@ -1,2 +1,2 @@
-abi_depends=5.10.0
-api_depends=${abi_depends}
+abi_depends=">=5.10.0"
+api_depends="${abi_depends}"
diff --git a/templates/pixman/depends b/templates/pixman/depends
index f161d95f7c4..3d77fdf442f 100644
--- a/templates/pixman/depends
+++ b/templates/pixman/depends
@@ -1,2 +1,2 @@
-abi_depends=0.14.0
-api_depends=${abi_depends}
+abi_depends=">=0.14.0"
+api_depends="${abi_depends}"
diff --git a/templates/pm-utils/depends b/templates/pm-utils/depends
index c820d07ef87..cc3626fc49c 100644
--- a/templates/pm-utils/depends
+++ b/templates/pm-utils/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.5
-api_depends=${abi_depends}
+abi_depends=">=1.2.5"
+api_depends="${abi_depends}"
diff --git a/templates/poppler/depends b/templates/poppler/depends
index c6525c43137..24fd32278f2 100644
--- a/templates/poppler/depends
+++ b/templates/poppler/depends
@@ -1,2 +1,2 @@
-abi_depends=0.10.6
-api_depends=${abi_depends}
+abi_depends=">=0.10.6"
+api_depends="${abi_depends}"
diff --git a/templates/popt/depends b/templates/popt/depends
index b1e4ba73726..5b63e2f6a3c 100644
--- a/templates/popt/depends
+++ b/templates/popt/depends
@@ -1,2 +1,2 @@
-abi_depends=1.15
-api_depends=${abi_depends}
+abi_depends=">=1.15"
+api_depends="${abi_depends}"
diff --git a/templates/proplib/depends b/templates/proplib/depends
index 7bbc10b5bad..4ce94207f01 100644
--- a/templates/proplib/depends
+++ b/templates/proplib/depends
@@ -1,2 +1,2 @@
-abi_depends=0.1
-api_depends=${abi_depends}
+abi_depends=">=0.1"
+api_depends="${abi_depends}"
diff --git a/templates/python/depends b/templates/python/depends
index 003c94e8c9b..17cfb5e7e10 100644
--- a/templates/python/depends
+++ b/templates/python/depends
@@ -1,2 +1,2 @@
-abi_depends=2.6.0
-api_depends=${abi_depends}
+abi_depends=">=2.6.0<3.0"
+api_depends="${abi_depends}"
diff --git a/templates/readline/depends b/templates/readline/depends
index 8f0b0358f09..df2b67e13a1 100644
--- a/templates/readline/depends
+++ b/templates/readline/depends
@@ -1,2 +1,2 @@
-abi_depends=6.0
-api_depends=${abi_depends}
+abi_depends=">=6.0"
+api_depends="${abi_depends}"
diff --git a/templates/sqlite/depends b/templates/sqlite/depends
index ec5dfc9cf3f..129f4772440 100644
--- a/templates/sqlite/depends
+++ b/templates/sqlite/depends
@@ -1,2 +1,2 @@
-abi_depends=3.6.13
-api_depends=${abi_depends}
+abi_depends=">=3.6.13"
+api_depends="${abi_depends}"
diff --git a/templates/startup-notification/depends b/templates/startup-notification/depends
index 46abaf6424d..beb99f5da3d 100644
--- a/templates/startup-notification/depends
+++ b/templates/startup-notification/depends
@@ -1,2 +1,2 @@
-abi_depends=0.10
-api_depends=${abi_depends}
+abi_depends=">=0.10"
+api_depends="${abi_depends}"
diff --git a/templates/tcp_wrappers/depends b/templates/tcp_wrappers/depends
index f43a6c7a0f2..b834c389761 100644
--- a/templates/tcp_wrappers/depends
+++ b/templates/tcp_wrappers/depends
@@ -1,2 +1,2 @@
-abi_depends=7.6
-api_depends=${abi_depends}
+abi_depends=">=7.6"
+api_depends="${abi_depends}"
diff --git a/templates/tiff/depends b/templates/tiff/depends
index 78a96f1fbea..32e97d91eb4 100644
--- a/templates/tiff/depends
+++ b/templates/tiff/depends
@@ -1,2 +1,2 @@
-abi_depends=3.8.2
-api_depends=${abi_depends}
+abi_depends=">=3.8.2"
+api_depends="${abi_depends}"
diff --git a/templates/udev/template b/templates/udev/template
index fb7acfdf6da..fe8273bcfdb 100644
--- a/templates/udev/template
+++ b/templates/udev/template
@@ -21,7 +21,7 @@ Add_dependency full glibc
 Add_dependency full procps
 Add_dependency full libblkid
 Add_dependency full acl
-Add_dependency full usbutils 0.82
+Add_dependency full usbutils	">=0.82"
 Add_dependency full pciutils
 Add_dependency build glib
 Add_dependency build gperf
diff --git a/templates/vte/depends b/templates/vte/depends
index 83fb2abd001..44bfc589a62 100644
--- a/templates/vte/depends
+++ b/templates/vte/depends
@@ -1,2 +1,2 @@
-abi_depends=0.20.1
-api_depends=${abi_depends}
+abi_depends=">=0.20.1"
+api_depends="${abi_depends}"
diff --git a/templates/webkit-gtk/depends b/templates/webkit-gtk/depends
index 0d0f34209bd..607d4102878 100644
--- a/templates/webkit-gtk/depends
+++ b/templates/webkit-gtk/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.6
-api_depends=${abi_depends}
+abi_depends=">=1.1.6"
+api_depends="${abi_depends}"
diff --git a/templates/webkit-gtk/template b/templates/webkit-gtk/template
index 2633049363a..372852f280c 100644
--- a/templates/webkit-gtk/template
+++ b/templates/webkit-gtk/template
@@ -19,19 +19,19 @@ long_desc="
  This is the GTK2+ port of the engine."
 
 subpackages="devel"
-Add_dependency build intltool
-Add_dependency build pkg-config
-Add_dependency build gperf
-Add_dependency build flex
-Add_dependency full glibc
-Add_dependency full sqlite
-Add_dependency full jpeg
-Add_dependency full gtk+
-Add_dependency full libxslt
-Add_dependency full libXt
-Add_dependency full librsvg
-Add_dependency build icu
-Add_dependency run  icu-libs
-Add_dependency full enchant
-Add_dependency full libsoup 2.28.0
-Add_dependency full gst-plugins-base
+Add_dependency build	intltool
+Add_dependency build	pkg-config
+Add_dependency build	gperf
+Add_dependency build	flex
+Add_dependency full	glibc
+Add_dependency full	sqlite
+Add_dependency full	jpeg
+Add_dependency full	gtk+
+Add_dependency full	libxslt
+Add_dependency full	libXt
+Add_dependency full	librsvg
+Add_dependency build	icu
+Add_dependency run	icu-libs
+Add_dependency full	enchant
+Add_dependency full	libsoup			">=2.28.0"
+Add_dependency full	gst-plugins-base
diff --git a/templates/xcb-util/depends b/templates/xcb-util/depends
index 4437967c178..aa201353116 100644
--- a/templates/xcb-util/depends
+++ b/templates/xcb-util/depends
@@ -1,2 +1,2 @@
-abi_depends=0.3.4
-api_depends=${abi_depends}
+abi_depends=">=0.3.4"
+api_depends="${abi_depends}"
diff --git a/templates/xf86-input-evdev/depends b/templates/xf86-input-evdev/depends
index 6d3ed476fac..1d0c5048b0f 100644
--- a/templates/xf86-input-evdev/depends
+++ b/templates/xf86-input-evdev/depends
@@ -1,2 +1,2 @@
-abi_depends=2.2.1
-api_depends=${abi_depends}
+abi_depends=">=2.2.1"
+api_depends="${abi_depends}"
diff --git a/templates/xf86-input-joystick/depends b/templates/xf86-input-joystick/depends
index f1de44d64f5..fd55a5e3473 100644
--- a/templates/xf86-input-joystick/depends
+++ b/templates/xf86-input-joystick/depends
@@ -1,2 +1,2 @@
-abi_depends=1.4.0
-api_depends=${abi_depends}
+abi_depends=">=1.4.0"
+api_depends="${abi_depends}"
diff --git a/templates/xf86-input-synaptics/depends b/templates/xf86-input-synaptics/depends
index 6951c6b567e..7d08e28214d 100644
--- a/templates/xf86-input-synaptics/depends
+++ b/templates/xf86-input-synaptics/depends
@@ -1,2 +1,2 @@
-abi_depends=1.1.0
-api_depends=${abi_depends}
+abi_depends=">=1.1.0"
+api_depends="${abi_depends}"
diff --git a/templates/xf86-video-intel/template b/templates/xf86-video-intel/template
index 483163e92dd..f348f6d96d9 100644
--- a/templates/xf86-video-intel/template
+++ b/templates/xf86-video-intel/template
@@ -11,4 +11,4 @@ long_desc="
  Xorg X11 server."
 
 Add_dependency full glibc
-Add_dependency full xorg-server 1.6.4_1
+Add_dependency full xorg-server	">=1.6.4_1"
diff --git a/templates/xf86-video-vmware/template b/templates/xf86-video-vmware/template
index fe4236e6853..544cbe0e356 100644
--- a/templates/xf86-video-vmware/template
+++ b/templates/xf86-video-vmware/template
@@ -11,4 +11,4 @@ long_desc="
  This is the VMware virtual video driver for the modular Xorg server."
 
 Add_dependency full glibc
-Add_dependency full xorg-server 1.7.1
+Add_dependency full xorg-server	">=1.7.1"
diff --git a/templates/xfce4-panel/depends b/templates/xfce4-panel/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/xfce4-panel/depends
+++ b/templates/xfce4-panel/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/xfce4-session/depends b/templates/xfce4-session/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/xfce4-session/depends
+++ b/templates/xfce4-session/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/xfconf/depends b/templates/xfconf/depends
index 20fab76a57d..86a5d572caf 100644
--- a/templates/xfconf/depends
+++ b/templates/xfconf/depends
@@ -1,2 +1,2 @@
-abi_depends=4.6.1
-api_depends=${abi_depends}
+abi_depends=">=4.6.1"
+api_depends="${abi_depends}"
diff --git a/templates/xorg-apps/template b/templates/xorg-apps/template
index a81d7c9d07f..3c55c496c6d 100644
--- a/templates/xorg-apps/template
+++ b/templates/xorg-apps/template
@@ -11,38 +11,38 @@ long_desc="
 replaces="xorg-server-utils"
 noarch=yes
 
-Add_dependency full iceauth	1.0.3
-Add_dependency full sessreg	1.0.5
-Add_dependency full setxkbmap	1.1.0
-Add_dependency full smproxy	1.0.3
-Add_dependency full x11perf	1.5.1
-Add_dependency full xauth	1.0.4
-Add_dependency full xbacklight	1.1.1
-Add_dependency full xcmsdb	1.0.2
-Add_dependency full xcursorgen	1.0.3
-Add_dependency full xdpyinfo	1.1.0
-Add_dependency full xdriinfo	1.0.3
-Add_dependency full xev		1.0.4
-Add_dependency full xgamma	1.0.3
-Add_dependency full xhost	1.0.3
-Add_dependency full xinput	1.5.0
-Add_dependency full xkbcomp	1.1.1
-Add_dependency full xkbevd	1.1.0
-Add_dependency full xkbutils	1.0.2
-Add_dependency full xkill	1.0.2
-Add_dependency full xlsatoms	1.0.2
-Add_dependency full xlsclients	1.0.2
-Add_dependency full xmodmap	1.0.4
-Add_dependency full xpr		1.0.3
-Add_dependency full xprop	1.1.0
-Add_dependency full xrandr	1.3.2
-Add_dependency full xrdb	1.0.6
-Add_dependency full xrefresh	1.0.3
-Add_dependency full xset	1.1.0
-Add_dependency full xsetroot	1.0.3
-Add_dependency full xvinfo	1.1.0
-Add_dependency full xwd		1.0.3
-Add_dependency full xwininfo	1.0.5
-Add_dependency full xwud	1.0.2
+Add_dependency full iceauth	">=1.0.3"
+Add_dependency full sessreg	">=1.0.5"
+Add_dependency full setxkbmap	">=1.1.0"
+Add_dependency full smproxy	">=1.0.3"
+Add_dependency full x11perf	">=1.5.1"
+Add_dependency full xauth	">=1.0.4"
+Add_dependency full xbacklight	">=1.1.1"
+Add_dependency full xcmsdb	">=1.0.2"
+Add_dependency full xcursorgen	">=1.0.3"
+Add_dependency full xdpyinfo	">=1.1.0"
+Add_dependency full xdriinfo	">=1.0.3"
+Add_dependency full xev		">=1.0.4"
+Add_dependency full xgamma	">=1.0.3"
+Add_dependency full xhost	">=1.0.3"
+Add_dependency full xinput	">=1.5.0"
+Add_dependency full xkbcomp	">=1.1.1"
+Add_dependency full xkbevd	">=1.1.0"
+Add_dependency full xkbutils	">=1.0.2"
+Add_dependency full xkill	">=1.0.2"
+Add_dependency full xlsatoms	">=1.0.2"
+Add_dependency full xlsclients	">=1.0.2"
+Add_dependency full xmodmap	">=1.0.4"
+Add_dependency full xpr		">=1.0.3"
+Add_dependency full xprop	">=1.1.0"
+Add_dependency full xrandr	">=1.3.2"
+Add_dependency full xrdb	">=1.0.6"
+Add_dependency full xrefresh	">=1.0.3"
+Add_dependency full xset	">=1.1.0"
+Add_dependency full xsetroot	">=1.0.3"
+Add_dependency full xvinfo	">=1.1.0"
+Add_dependency full xwd		">=1.0.3"
+Add_dependency full xwininfo	">=1.0.5"
+Add_dependency full xwud	">=1.0.2"
 # xinit is not in xorg-7.5 app directory?!!
-Add_dependency full xinit	1.1.1
+Add_dependency full xinit	">=1.1.1"
diff --git a/templates/xorg-fonts/template b/templates/xorg-fonts/template
index 37f9dec8d31..9de1a17e814 100644
--- a/templates/xorg-fonts/template
+++ b/templates/xorg-fonts/template
@@ -10,26 +10,26 @@ long_desc="
 
 noarch=yes
 Add_dependency full encodings
-Add_dependency full font-adobe-100dpi			1.0.1
-Add_dependency full font-adobe-75dpi			1.0.1
-Add_dependency full font-adobe-utopia-100dpi		1.0.2
-Add_dependency full font-adobe-utopia-75dpi		1.0.2
-Add_dependency full font-adobe-utopia-type1		1.0.2
-Add_dependency full font-bh-100dpi			1.0.1
-Add_dependency full font-bh-75dpi			1.0.1
-Add_dependency full font-bh-lucidatypewriter-100dpi	1.0.1
-Add_dependency full font-bh-lucidatypewriter-75dpi	1.0.1
-Add_dependency full font-bh-ttf				1.0.1
-Add_dependency full font-bh-type1			1.0.1
-Add_dependency full font-bitstream-100dpi		1.0.1
-Add_dependency full font-bitstream-75dpi		1.0.1
-Add_dependency full font-bitstream-type1		1.0.1
-Add_dependency full font-cursor-misc			1.0.1
-Add_dependency full font-daewoo-misc			1.0.1
-Add_dependency full font-dec-misc			1.0.1
-Add_dependency full font-ibm-type1			1.0.1
-Add_dependency full font-isas-misc			1.0.1
-Add_dependency full font-jis-misc			1.0.1
-Add_dependency full font-misc-misc			1.1.0
-Add_dependency full font-mutt-misc			1.0.1
+Add_dependency full font-adobe-100dpi			">=1.0.1"
+Add_dependency full font-adobe-75dpi			">=1.0.1"
+Add_dependency full font-adobe-utopia-100dpi		">=1.0.2"
+Add_dependency full font-adobe-utopia-75dpi		">=1.0.2"
+Add_dependency full font-adobe-utopia-type1		">=1.0.2"
+Add_dependency full font-bh-100dpi			">=1.0.1"
+Add_dependency full font-bh-75dpi			">=1.0.1"
+Add_dependency full font-bh-lucidatypewriter-100dpi	">=1.0.1"
+Add_dependency full font-bh-lucidatypewriter-75dpi	">=1.0.1"
+Add_dependency full font-bh-ttf				">=1.0.1"
+Add_dependency full font-bh-type1			">=1.0.1"
+Add_dependency full font-bitstream-100dpi		">=1.0.1"
+Add_dependency full font-bitstream-75dpi		">=1.0.1"
+Add_dependency full font-bitstream-type1		">=1.0.1"
+Add_dependency full font-cursor-misc			">=1.0.1"
+Add_dependency full font-daewoo-misc			">=1.0.1"
+Add_dependency full font-dec-misc			">=1.0.1"
+Add_dependency full font-ibm-type1			">=1.0.1"
+Add_dependency full font-isas-misc			">=1.0.1"
+Add_dependency full font-jis-misc			">=1.0.1"
+Add_dependency full font-misc-misc			">=1.1.0"
+Add_dependency full font-mutt-misc			">=1.0.1"
 Add_dependency full dejavu-fonts-ttf
diff --git a/templates/xorg-input-drivers/template b/templates/xorg-input-drivers/template
index 0a7b0e4107b..a0de5bdc187 100644
--- a/templates/xorg-input-drivers/template
+++ b/templates/xorg-input-drivers/template
@@ -9,12 +9,12 @@ long_desc="
  X.org xserver input drivers from the modular Xorg X11 project."
 
 noarch=yes
-Add_dependency full xf86-input-acecad		1.4.0
-Add_dependency full xf86-input-aiptek		1.3.0
-Add_dependency full xf86-input-evdev		2.3.0
-Add_dependency full xf86-input-joystick		1.4.99.2
-Add_dependency full xf86-input-keyboard		1.4.0
-Add_dependency full xf86-input-mouse		1.5.0
-Add_dependency full xf86-input-synaptics	1.2.0
-Add_dependency full xf86-input-vmmouse		12.6.5
-Add_dependency full xf86-input-void		1.3.0
+Add_dependency full xf86-input-acecad		">=1.4.0"
+Add_dependency full xf86-input-aiptek		">=1.3.0"
+Add_dependency full xf86-input-evdev		">=2.3.0"
+Add_dependency full xf86-input-joystick		">=1.4.99.2"
+Add_dependency full xf86-input-keyboard		">=1.4.0"
+Add_dependency full xf86-input-mouse		">=1.5.0"
+Add_dependency full xf86-input-synaptics	">=1.2.0"
+Add_dependency full xf86-input-vmmouse		">=12.6.5"
+Add_dependency full xf86-input-void		">=1.3.0"
diff --git a/templates/xorg-server/depends b/templates/xorg-server/depends
index d28587ae8cd..89acd330c29 100644
--- a/templates/xorg-server/depends
+++ b/templates/xorg-server/depends
@@ -1,2 +1,2 @@
-abi_depends=1.6.0
-api_depends=${abi_depends}
+abi_depends=">=1.6.0"
+api_depends="${abi_depends}"
diff --git a/templates/xorg-server/template b/templates/xorg-server/template
index c0ab10fa546..71637c804c3 100644
--- a/templates/xorg-server/template
+++ b/templates/xorg-server/template
@@ -17,7 +17,7 @@ long_desc="
 conf_files="/etc/dbus-1/system.d/xorg-server.conf"
 subpackages="devel"
 
-Add_dependency build dri2proto 2.1
+Add_dependency build dri2proto	">=2.1"
 Add_dependency full glibc
 Add_dependency full openssl
 Add_dependency full dbus
diff --git a/templates/xorg-video-drivers/template b/templates/xorg-video-drivers/template
index 74882e5011d..b1f3d17e6be 100644
--- a/templates/xorg-video-drivers/template
+++ b/templates/xorg-video-drivers/template
@@ -9,38 +9,38 @@ long_desc="
  X.org xserver video drivers from the modular Xorg X11 project."
 
 noarch=yes
-Add_dependency full xf86-video-apm		1.2.2
-Add_dependency full xf86-video-ark		0.7.2
-Add_dependency full xf86-video-ast		0.89.9
-Add_dependency full xf86-video-ati		6.12.4
-Add_dependency full xf86-video-chips		1.2.2
-Add_dependency full xf86-video-cirrus		1.3.2
-Add_dependency full xf86-video-fbdev		0.4.1
-Add_dependency full xf86-video-geode		2.11.6
-Add_dependency full xf86-video-glint		1.2.4
-Add_dependency full xf86-video-i128		1.3.3
-Add_dependency full xf86-video-i740		1.3.2
-Add_dependency full xf86-video-intel		2.9.1
-Add_dependency full xf86-video-mach64		6.8.2
-Add_dependency full xf86-video-mga		1.4.11
-Add_dependency full xf86-video-neomagic		1.2.4
-Add_dependency full xf86-video-nv		2.1.15
-Add_dependency full xf86-video-openchrome	0.2.904
-Add_dependency full xf86-video-r128		6.8.1
+Add_dependency full xf86-video-apm		">=1.2.2"
+Add_dependency full xf86-video-ark		">=0.7.2"
+Add_dependency full xf86-video-ast		">=0.89.9"
+Add_dependency full xf86-video-ati		">=6.12.4"
+Add_dependency full xf86-video-chips		">=1.2.2"
+Add_dependency full xf86-video-cirrus		">=1.3.2"
+Add_dependency full xf86-video-fbdev		">=0.4.1"
+Add_dependency full xf86-video-geode		">=2.11.6"
+Add_dependency full xf86-video-glint		">=1.2.4"
+Add_dependency full xf86-video-i128		">=1.3.3"
+Add_dependency full xf86-video-i740		">=1.3.2"
+Add_dependency full xf86-video-intel		">=2.9.1"
+Add_dependency full xf86-video-mach64		">=6.8.2"
+Add_dependency full xf86-video-mga		">=1.4.11"
+Add_dependency full xf86-video-neomagic		">=1.2.4"
+Add_dependency full xf86-video-nv		">=2.1.15"
+Add_dependency full xf86-video-openchrome	">=0.2.904"
+Add_dependency full xf86-video-r128		">=6.8.1"
 # radeonhd is not part of xorg 7.5
-Add_dependency full xf86-video-radeonhd		1.3.0
-#Add_dependency full xf86-video-rendition	4.2.3
-Add_dependency full xf86-video-s3		0.6.3
-Add_dependency full xf86-video-s3virge		1.10.4
-Add_dependency full xf86-video-savage		2.3.1
-Add_dependency full xf86-video-siliconmotion	1.7.3
-Add_dependency full xf86-video-sis		0.10.2
-Add_dependency full xf86-video-sisusb		0.9.3
-Add_dependency full xf86-video-tdfx		1.4.3
-Add_dependency full xf86-video-trident		1.3.3
-Add_dependency full xf86-video-tseng		1.2.3
-Add_dependency full xf86-video-v4l		0.2.0
-Add_dependency full xf86-video-vesa		2.2.1
-Add_dependency full xf86-video-vmware		10.16.8
-Add_dependency full xf86-video-voodoo		1.2.3
-#Add_dependency full xf86-video-xgixp		1.7.99.4
+Add_dependency full xf86-video-radeonhd		">=1.3.0"
+#Add_dependency full xf86-video-rendition	">=4.2.3"
+Add_dependency full xf86-video-s3		">=0.6.3"
+Add_dependency full xf86-video-s3virge		">=1.10.4"
+Add_dependency full xf86-video-savage		">=2.3.1"
+Add_dependency full xf86-video-siliconmotion	">=1.7.3"
+Add_dependency full xf86-video-sis		">=0.10.2"
+Add_dependency full xf86-video-sisusb		">=0.9.3"
+Add_dependency full xf86-video-tdfx		">=1.4.3"
+Add_dependency full xf86-video-trident		">=1.3.3"
+Add_dependency full xf86-video-tseng		">=1.2.3"
+Add_dependency full xf86-video-v4l		">=0.2.0"
+Add_dependency full xf86-video-vesa		">=2.2.1"
+Add_dependency full xf86-video-vmware		">=10.16.8"
+Add_dependency full xf86-video-voodoo		">=1.2.3"
+#Add_dependency full xf86-video-xgixp		">=1.7.99.4"
diff --git a/templates/xorg/template b/templates/xorg/template
index 13957625ab4..49e4bdcf779 100644
--- a/templates/xorg/template
+++ b/templates/xorg/template
@@ -9,8 +9,8 @@ long_desc="
  meta-packages (server, clients, fonts, etc) from the X.org project."
 
 noarch=yes
-Add_dependency full xorg-fonts		$version
-Add_dependency full xorg-server		1.7.1
-Add_dependency full xorg-apps		$version
-Add_dependency full xorg-input-drivers	$version
-Add_dependency full xorg-video-drivers	$version
+Add_dependency full xorg-fonts		">=$version"
+Add_dependency full xorg-server		">=1.7.1"
+Add_dependency full xorg-apps		">=$version"
+Add_dependency full xorg-input-drivers	">=$version"
+Add_dependency full xorg-video-drivers	">=$version"
diff --git a/templates/xz/depends b/templates/xz/depends
index f6259e40bf3..ab6683c66b6 100644
--- a/templates/xz/depends
+++ b/templates/xz/depends
@@ -1,2 +1,2 @@
-abi_depends=4.999.9
-api_depends=${abi_depends}
+abi_depends=">=4.999.9"
+api_depends="${abi_depends}"
diff --git a/templates/zlib/depends b/templates/zlib/depends
index eef117f0547..279bbc74c43 100644
--- a/templates/zlib/depends
+++ b/templates/zlib/depends
@@ -1,2 +1,2 @@
-abi_depends=1.2.3
-api_depends=${abi_depends}
+abi_depends=">=1.2.3"
+api_depends="${abi_depends}"
diff --git a/xbps-src/shutils/builddep_funcs.sh b/xbps-src/shutils/builddep_funcs.sh
index 56b0407145a..c2e16ca9640 100644
--- a/xbps-src/shutils/builddep_funcs.sh
+++ b/xbps-src/shutils/builddep_funcs.sh
@@ -32,15 +32,15 @@
 install_pkg_deps()
 {
 	local curpkg="$1"
-	local curpkgname=$(${XBPS_PKGDB_CMD} getpkgname $1)
-	local saved_prevpkg=$(${XBPS_PKGDB_CMD} getpkgname $2)
+	local curpkgname="$(${XBPS_PKGDB_CMD} getpkgdepname $1)"
+	local saved_prevpkg="$(${XBPS_PKGDB_CMD} getpkgdepname $2)"
 	local j jver jname reqver
 
 	[ -z "$curpkg" ] && return 1
 
 	if [ -n "$prev_pkg" ]; then
 		curpkg=$prev_pkg
-		curpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${curpkg})
+		curpkgname="$(${XBPS_PKGDB_CMD} getpkgdepname ${curpkg})"
 	fi
 
 	msg_normal "Installing $saved_prevpkg dependency: $curpkgname."
@@ -50,33 +50,32 @@ install_pkg_deps()
 	if [ $? -eq 0 ]; then
 		msg_normal "Dependency $curpkgname requires:"
 		for j in ${build_depends}; do
-			jname=$(${XBPS_PKGDB_CMD} getpkgname ${j})
-			jver=$($XBPS_PKGDB_CMD version ${jname})
-			reqver=$(${XBPS_PKGDB_CMD} getpkgversion ${j})
-                	check_installed_pkg $j
-                	if [ $? -eq 0 ]; then
-                        	echo "   $jname >= $reqver: found $jname-$jver."
-                	else
-                        	echo "   $jname >= $reqver: not found."
-                	fi
+			jname="$(${XBPS_PKGDB_CMD} getpkgdepname ${j})"
+			jver="$($XBPS_PKGDB_CMD version ${jname})"
+			check_pkgdep_matched "${j}"
+			if [ $? -eq 0 ]; then
+				echo "   ${j}: found $jname-$jver."
+			else
+				echo "   ${j}: not found."
+			fi
 		done
 	fi
 
-        for j in ${build_depends}; do
-                #
-                # Check if dep already installed.
-                #
-                check_installed_pkg $j
-                [ $? -eq 0 ] && continue
+	for j in ${build_depends}; do
+		#
+		# Check if dep is satisfied.
+		#
+		check_pkgdep_matched "${j}"
+		[ $? -eq 0 ] && continue
 
-                [ -n "$prev_pkg" ] && unset prev_pkg
-                #
+		[ -n "$prev_pkg" ] && unset prev_pkg
+		#
 		# Iterate again, this will check if there are more
 		# required deps for current pkg.
-                #
-                install_pkg_deps $j $curpkg
-                prev_pkg="$j"
-        done
+		#
+		install_pkg_deps $j $curpkg
+		prev_pkg="$j"
+	done
 
 	install_pkg $curpkgname
 	[ -n "$prev_pkg" ] && unset prev_pkg
@@ -88,8 +87,8 @@ install_pkg_deps()
 install_dependencies_pkg()
 {
 	local pkg="$1"
-	local lpkgname=$(${XBPS_PKGDB_CMD} getpkgname ${pkg})
-	local i ipkgname ivers reqvers notinstalled_deps lver
+	local lpkgname=$(${XBPS_PKGDB_CMD} getpkgdepname ${pkg})
+	local i pkgn iver reqver notinstalled_deps lver
 
 	[ -z "$pkg" ] && return 1
 
@@ -103,15 +102,14 @@ install_dependencies_pkg()
 
 	msg_normal "Required build dependencies for $pkgname-$lver... "
 	for i in ${build_depends}; do
-                ipkgname=$(${XBPS_PKGDB_CMD} getpkgname ${i})
-                ivers=$($XBPS_PKGDB_CMD version $ipkgname)
-                reqvers=$(${XBPS_PKGDB_CMD} getpkgversion ${i})
-		check_installed_pkg $i
+		pkgn="$($XBPS_PKGDB_CMD getpkgdepname ${i})"
+		iver="$($XBPS_PKGDB_CMD version $pkgn)"
+		check_pkgdep_matched "${i}"
 		if [ $? -eq 0 ]; then
-			echo "  $ipkgname >= $reqvers: found $ipkgname-$ivers."
+			echo "  ${i}: found $pkgn-$iver."
 			continue
 		else
-			echo "  $ipkgname >= $reqvers: not found."
+			echo "  ${i}: not found."
 			notinstalled_deps="$notinstalled_deps $i"
 		fi
 	done
@@ -119,39 +117,57 @@ install_dependencies_pkg()
 	[ -z "$notinstalled_deps" ] && return 0
 
 	for i in ${notinstalled_deps}; do
-		check_installed_pkg $i
+		pkgn=$($XBPS_PKGDB_CMD getpkgdepname ${i})
+		check_pkgdep_matched "${i}"
 		[ $? -eq 0 ] && continue
 
-		ipkgname=$(${XBPS_PKGDB_CMD} getpkgname ${i})
-		run_template $ipkgname
+		run_template $pkgn
 		check_build_depends_pkg
 		if [ $? -eq 1 ]; then
-			msg_normal "Installing $lpkgname dependency: $ipkgname."
-			install_pkg $ipkgname
+			msg_normal "Installing $lpkgname dependency: $pkgn."
+			install_pkg $pkgn
 		else
-			install_pkg_deps $i $pkg
+			install_pkg_deps "${i}" $pkg
 		fi
 	done
 }
 
 #
-# Checks the registered pkgs db file and returns 0 if a pkg that satisfies
-# the minimal required version is there, or 1 otherwise.
+# Checks if installed pkg dependency is matched against pattern.
 #
-check_installed_pkg()
+check_pkgdep_matched()
 {
-	local pkg="$1"
-	local pkgname reqver iver
+	local pkg="$1" pkgname iver
 
 	[ -z "$pkg" ] && return 2
 
-	pkgname=$(${XBPS_PKGDB_CMD} getpkgname $pkg)
-	reqver=$(${XBPS_PKGDB_CMD} getpkgversion $pkg)
+	pkgname="$($XBPS_PKGDB_CMD getpkgdepname ${pkg})"
 	run_template $pkgname
 
 	iver="$($XBPS_PKGDB_CMD version $pkgname)"
 	if [ -n "$iver" ]; then
-		${XBPS_CMPVER_CMD} $pkgname-$iver $pkgname-$reqver
+		${XBPS_PKGDB_CMD} pkgmatch "${pkgname}-${iver}" "${pkg}"
+		[ $? -eq 1 ] && return 0
+	fi
+
+	return 1
+}
+
+#
+# Check if installed package is installed.
+#
+check_installed_pkg()
+{
+	local pkg="$1" pkgname iver
+
+	[ -z "$pkg" ] && return 2
+
+	pkgname="$($XBPS_PKGDB_CMD getpkgname ${pkg})"
+	run_template $pkgname
+
+	iver="$($XBPS_PKGDB_CMD version $pkgname)"
+	if [ -n "$iver" ]; then
+		${XBPS_CMPVER_CMD} "${pkgname}-${iver}" "${pkg}"
 		[ $? -eq 0 -o $? -eq 1 ] && return 0
 	fi
 
diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index c0cfd375e7b..c97c8445cfa 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -300,7 +300,7 @@ _EOF
 		echo "<key>run_depends</key>" >> $TMPFPROPS
 		echo "<array>" >> $TMPFPROPS
 		for f in ${run_depends}; do
-			echo "<string>$f</string>" >> $TMPFPROPS
+			echo "<string>$(echo $f|sed "s|<|\&lt;|g;s|>|\&gt;|g")</string>" >> $TMPFPROPS
 		done
 		echo "</array>" >> $TMPFPROPS
 	fi
diff --git a/xbps-src/shutils/tmpl_funcs.sh b/xbps-src/shutils/tmpl_funcs.sh
index 56d8a218b86..609ac0034f4 100644
--- a/xbps-src/shutils/tmpl_funcs.sh
+++ b/xbps-src/shutils/tmpl_funcs.sh
@@ -115,38 +115,38 @@ setup_tmpl()
 
 Add_dependency()
 {
-	local type="$1"
-	local pkgname="$2"
-	local minver="$3"
+	local type="$1" pkgname="$2" version="$3"
 
 	case "$type" in
 		build|full|run) ;;
 		*) msg_error "Unknown dependency type for $pkgname." ;;
 	esac
 
-	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends ]; then
-		. $XBPS_TEMPLATESDIR/$pkgname/$pkgname.depends
-	elif [ -f $XBPS_TEMPLATESDIR/$pkgname/depends ]; then
-		. $XBPS_TEMPLATESDIR/$pkgname/depends
+	[ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!"
+
+	if [ -f $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends ]; then
+		. $XBPS_TEMPLATESDIR/${pkgname}/${pkgname}.depends
+	elif [ -f $XBPS_TEMPLATESDIR/${pkgname}/depends ]; then
+		. $XBPS_TEMPLATESDIR/${pkgname}/depends
 	fi
 
 	if [ "$type" = "full" -o "$type" = "build" ]; then
-		if [ -z "$minver" -a -z "$api_depends" ]; then
-			build_depends="${build_depends} $pkgname-0"
-		elif [ -z "$minver" -a -n "$api_depends" ]; then
-			build_depends="${build_depends} $pkgname-$api_depends"
+		if [ -z "$version" -a -z "$api_depends" ]; then
+			build_depends="${build_depends} ${pkgname}>=0"
+		elif [ -z "$version" -a -n "$api_depends" ]; then
+			build_depends="${build_depends} ${pkgname}${api_depends}"
 		else
-			build_depends="${build_depends} $pkgname-$minver"
+			build_depends="${build_depends} ${pkgname}${version}"
 		fi
 	fi
 
 	if [ "$type" = "full" -o "$type" = "run" ]; then
-		if [ -z "$minver" -a -z "$abi_depends" ]; then
-			run_depends="${run_depends} $pkgname-0"
-		elif [ -z "$minver" -a -n "$abi_depends" ]; then
-			run_depends="${run_depends} $pkgname-$abi_depends"
+		if [ -z "$version" -a -z "$abi_depends" ]; then
+			run_depends="${run_depends} ${pkgname}>=0"
+		elif [ -z "$version" -a -n "$abi_depends" ]; then
+			run_depends="${run_depends} ${pkgname}${abi_depends}"
 		else
-			run_depends="${run_depends} $pkgname-$minver"
+			run_depends="${run_depends} ${pkgname}${version}"
 		fi
 	fi
 
diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 3a48b3469f4..c9db13314e1 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -30,6 +30,7 @@ trap "echo && exit 1" INT QUIT
 : ${progname:=$(basename $0)}
 : ${fakeroot_cmd:=fakeroot}
 : ${xbps_machine:=$(uname -m)}
+: ${XBPS_UTILS_REQVER:=20091107}
 
 usage()
 {
@@ -89,7 +90,7 @@ run_file()
 
 set_defvars()
 {
-	local DDIRS i
+	local DDIRS i instver
 
 	: ${XBPS_TEMPLATESDIR:=$XBPS_DISTRIBUTIONDIR/templates}
 	: ${XBPS_TRIGGERSDIR:=$XBPS_DISTRIBUTIONDIR/triggers}
@@ -112,6 +113,18 @@ set_defvars()
 	export XBPS_DIGEST_CMD="xbps-digest.static"
 	export XBPS_CMPVER_CMD="xbps-cmpver.static"
 	export XBPS_FETCH_CMD="xbps-fetch.static"
+
+	#
+	# Check that installed xbps utils version is recent enough.
+	#
+	instver=$(${XBPS_PKGDB_CMD} -V)
+	${XBPS_CMPVER_CMD} "${instver}" "${XBPS_UTILS_REQVER}"
+	if [ $? -eq 255 ]; then
+		echo -n "Your xbps utilities are too old, "
+		echo "required version: ${XBPS_UTILS_REQVER}"
+		exit 1
+	fi
+
 }
 
 #