diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 04840f0..ee0986f 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -97,8 +97,8 @@ SRC_URI="${SERVER_URI}"
 		http://ftp.mars.arge.at/mysql/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
 mysql_version_is_at_least "5.1.12" \
 && [[ -n "${PBXT_VERSION}" ]] \
-&& SRC_URI="${SRC_URI} pbxt? ( mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz
-				http://www.primebase.org/download/pbxt-${PBXT_VERSION}.tar.gz )"
+&& SRC_URI="${SRC_URI} http://www.primebase.org/download/pbxt-${PBXT_VERSION}.tar.gz
+				mirror://sourceforge/pbxt/pbxt-${PBXT_VERSION}.tar.gz"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
@@ -473,6 +473,13 @@ mysql_src_unpack() {
 	[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git_src_unpack
 	
 	mv -f "${WORKDIR}/${MY_SOURCEDIR}" "${S}"
+
+	if mysql_version_is_at_least "5.1.12" ; then
+		if [ -n "${PBXT_VERSION}" ]; then
+			mv -f "${WORKDIR}/pbxt-${PBXT_VERSION}" "${S}/storage/pbxt"
+		fi
+	fi
+
 	cd "${S}"
 
 	# Apply the patches for this MySQL version
@@ -542,10 +549,6 @@ mysql_src_unpack() {
 		popd &>/dev/null
 	fi
 
-	mysql_version_is_at_least "5.1.12" \
-	&& [[ -n "${PBXT_VERSION}" ]] \
-	&& mv ../pbxt-${PBXT_VERSION} storage/pbxt
-
 }
 
 mysql_src_compile() {