--- pcbsd/current/src-sh/pbi-manager/pbi-manager.orig	2011-08-23 20:03:45.241920033 +0000
+++ pcbsd/current/src-sh/pbi-manager/pbi-manager	2011-08-23 20:22:11.065955246 +0000
@@ -5934,12 +5934,28 @@ mk_chroot_file() {
 	
 	# Figure out which version of FreeBSD to checkout
 	local _osRel=`uname -r`
-	echo $_osRel | grep "CURRENT" >/dev/null 2>/dev/null
+	echo $_osRel | grep "RELEASE" >/dev/null 2>/dev/null
 	if [ "$?" = "0" ] ; then
-		local svnUrl="svn://svn.freebsd.org/base/head"
-	else
 		local _osMajor=`echo $_osRel | cut -c 1-1`
 		local svnUrl="svn://svn.freebsd.org/base/releng/${_osMajor}.0"
+		echo "Using $svnUrl for sources"
+	else
+		echo $_osRel | grep "CURRENT" >/dev/null 2>/dev/null
+		if [ "$?" = "0" ] ; then
+		      local svnUrl="svn://svn.freebsd.org/base/head"
+		      echo "Using $svnUrl for sources"
+		else
+		      echo $_osRel | grep "STABLE" >/dev/null 2>/dev/null
+		      if [ "$?" = "0" ] ; then
+			    local _osMajor=`echo $_osRel | cut -c 1-1`
+			    local svnUrl="svn://svn.freebsd.org/base/stable/${_osMajor}"
+			    "Using $svnUrl for sources"
+		      else
+			    local svnUrl="svn://svn.freebsd.org/base/head"
+			    echo "Using $svnUrl for sources"
+			    echo "Assuming a BETA|RC or rarely used FreeBSD version. Using CURRENT!"
+		      fi
+		fi
 	fi
 
 	echo "Checking out FreeBSD sources from $svnUrl"