diff --git a/doc/TODO b/doc/TODO
index 5452abd2249..759692ae10e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,8 +3,6 @@ xbps-src:
  * Multiple URLs to download source distribution files, aliases, etc.
    Something like ${sourceforge} to pick up any specified mirror on the list.
  * More robust and fast dependency checking.
- * $version needs to have a dot to be found by xbps.sh.
-   Some packages do not have a dot on its version, like udev-130.
  * Add support to run the prepost-* scripts, so that the same actions are
    performed in source/bin packages. Use current postinstall_helpers to
    automatically add triggers, shared by src/bin pkgs. [IN PROGRESS]
diff --git a/shutils/builddep_funcs.sh b/shutils/builddep_funcs.sh
index 581e897401b..442b4c5f864 100644
--- a/shutils/builddep_funcs.sh
+++ b/shutils/builddep_funcs.sh
@@ -1,5 +1,5 @@
 #-
-# Copyright (c) 2008 Juan Romero Pardines.
+# Copyright (c) 2008-2009 Juan Romero Pardines.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,15 @@
 
 . $XBPS_SHUTILSDIR/tmpl_funcs.sh
 
+run_template()
+{
+	local pkg="$1"
+
+	if [ "$pkgname" != "$pkg" ]; then
+		reset_tmpl_vars
+		. $XBPS_TEMPLATESDIR/$pkg/template
+	fi
+}
 #
 # Recursive function that founds dependencies in all required
 # packages.
@@ -32,27 +41,28 @@
 add_dependency_tolist()
 {
 	local curpkg="$1"
+	local curpkgname=
 	local j=
+	local jver=
+	local jname=
 
 	[ -z "$curpkg" ] && return 1
 	[ -n "$prev_pkg" ] && curpkg=$prev_pkg
 
-	if [ "$pkgname" != "${curpkg%-[0-9]*.*}" ]; then
-		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${curpkg%-[0-9]*.*}/template
-	fi
+	curpkgname=$(xbps-pkgdb getpkgname ${curpkg})
+	run_template $curpkgname
 
 	for j in ${build_depends}; do
 		#
 		# Check if dep already installed.
 		#
-		check_installed_pkg $j ${j##[aA-zZ]*-}
+		check_installed_pkg $j
 		#
 		# If dep is already installed, check one more time
 		# if all its deps are there and continue.
 		#
 		if [ $? -eq 0 ]; then
-			install_builddeps_required_pkg $j
+			#install_builddeps_required_pkg $j
 			installed_deps_list="$j $installed_deps_list"
 			continue
 		fi
@@ -62,7 +72,7 @@ add_dependency_tolist()
 		#
 		# Check if dependency needs more deps.
 		#
-		check_build_depends_pkg ${j%-[0-9]*.*}
+		check_build_depends_pkg $j
 		if [ $? -eq 0 ]; then
 			add_dependency_tolist $j
 			prev_pkg="$j"
@@ -127,8 +137,10 @@ install_dependencies_pkg()
 {
 	local pkg="$1"
 	local i=
-	local ipkg=
+	local ipkgname=
 	local iversion=
+	local reqname=
+	local reqvers=
 	deps_list=
 	installed_deps_list=
 
@@ -145,22 +157,26 @@ install_dependencies_pkg()
 
 	msg_normal "Required minimal deps for $(basename $pkg):"
 	for i in ${installed_deps_list}; do
-		ipkg=${i%-[0-9]*.*}
-		iversion="$($XBPS_REGPKGDB_CMD version $ipkg)"
-		echo "	$ipkg >= ${i##[aA-zZ]*-}: found $ipkg-$iversion."
+		ipkgname=$(xbps-pkgdb getpkgname ${i})
+		iversion=$($XBPS_REGPKGDB_CMD version $ipkgname)
+		reqvers=$(xbps-pkgdb getpkgversion ${i})
+		echo "	$ipkgname >= $reqvers: found $ipkgname-$iversion."
 	done
 
 	for i in ${deps_list}; do
-		echo "	${i%-[0-9]*.*} >= ${i##[aA-zZ]*-}: not found."
+		reqname=$(xbps-pkgdb getpkgname ${i})
+		reqvers=$(xbps-pkgdb getpkgversion ${i})
+		echo "	$reqname >= $reqvers: not found."
 	done
 
 	for i in ${deps_list}; do
 		# skip dup deps
-		check_installed_pkg $i ${i##[aA-zZ]*-}
+		check_installed_pkg $i
 		[ $? -eq 0 ] && continue
 		# continue installing deps
 		msg_normal "Installing $pkg dependency: $i."
-		install_pkg ${i%-[0-9]*.*}
+		ipkgname=$(xbps-pkgdb getpkgname ${i})
+		install_pkg $ipkgname
 	done
 
 	unset installed_deps_list
@@ -170,19 +186,20 @@ install_dependencies_pkg()
 install_builddeps_required_pkg()
 {
 	local pkg="$1"
+	local pkgname=$(xbps-pkgdb getpkgname ${pkg})
 	local dep=
+	local depname=
 
 	[ -z "$pkg" ] && return 1
 
-	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
-	fi
+	run_template $pkgname
 
 	for dep in ${build_depends}; do
-		check_installed_pkg $dep ${dep##[aA-zZ]*-}
+		check_installed_pkg $dep
 		if [ $? -ne 0 ]; then
 			msg_normal "Installing $pkg dependency: $dep."
-			install_pkg ${dep%-[0-9]*.*}
+			depname=$(xbps-pkgdb getpkgname ${dep})
+			install_pkg $depname
 		fi
 	done
 }
@@ -194,15 +211,15 @@ install_builddeps_required_pkg()
 check_installed_pkg()
 {
 	local pkg="$1"
-	local reqver="$2"
+	local pkgname=
+	local reqver=
 	local iver=
 
-	[ -z "$pkg" -o -z "$reqver" ] && return 1
+	[ -z "$pkg" ] && return 1
 
-	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
-		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
-	fi
+	pkgname=$(xbps-pkgdb getpkgname $pkg)
+	reqver=$(xbps-pkgdb getpkgversion $pkg)
+	run_template $pkgname
 
 	iver="$($XBPS_REGPKGDB_CMD version $pkgname)"
 	if [ -n "$iver" ]; then
@@ -220,13 +237,11 @@ check_installed_pkg()
 check_build_depends_pkg()
 {
 	local pkg="$1"
+	local pkgname=$(xbps-pkgdb getpkgname ${pkg})
 
 	[ -z $pkg ] && return 1
 
-	if [ "$pkgname" != "${pkg%-[0-9]*.*}" ]; then
-		reset_tmpl_vars
-		. $XBPS_TEMPLATESDIR/${pkg%-[0-9]*.*}/template
-	fi
+	run_template $pkgname
 
 	if [ -n "$build_depends" ]; then
 		return 0
diff --git a/shutils/chroot.sh b/shutils/chroot.sh
index 3786c366cde..467db811712 100644
--- a/shutils/chroot.sh
+++ b/shutils/chroot.sh
@@ -237,7 +237,7 @@ umount_chroot_fs()
 [ -n "$base_chroot" ] && return 0
 
 . $XBPS_SHUTILSDIR/builddep_funcs.sh
-check_installed_pkg xbps-base-chroot 0.1
+check_installed_pkg xbps-base-chroot-0.1
 if [ $? -ne 0 ]; then
 	echo "The '$pkgname' package requires to be installed in a chroot."
 	echo "Please install the 'xbps-base-chroot' package and try again."
diff --git a/shutils/stow_funcs.sh b/shutils/stow_funcs.sh
index 91312a4aaab..19b509f3924 100644
--- a/shutils/stow_funcs.sh
+++ b/shutils/stow_funcs.sh
@@ -65,10 +65,7 @@ stow_pkg()
 	#
 	# Run template postinstall helpers if requested.
 	#
-	if [ "$pkgname" != "${pkg%%-$version}" ]; then
-		. $XBPS_TEMPLATESDIR/${pkg%%-$version}/template
-	fi
-
+	run_template $pkgname
 	for i in ${postinstall_helpers}; do
 		local pihf="$XBPS_HELPERSDIR/$i"
 		[ -f "$pihf" ] && . $pihf