diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index c3c2cac..505a66b 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -174,13 +174,19 @@ pkg_postinst() {
 	echo ""
 	elog "    For a basic setup, you may use emerge --config ${PN}"
 	echo ""
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
-		elog "Important 4.0+ updates"
-		elog "  - The on-wire protocol version has been changed."
-		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-		elog "    trqauthd to your default runlevel."
-	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 4.0 ${v}; then
+			echo
+			elog "Important 4.0+ updates"
+			elog "  - The on-wire protocol version has been changed."
+			elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
+			elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
+			elog "    trqauthd to your default runlevel."
+			break
+		 fi
+	done
 }
 
 # root will be setup as the primary operator/manager, the local machine
diff --git a/sys-cluster/torque/torque-4.2.9-r5.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild
index d972010..4f70549 100644
--- a/sys-cluster/torque/torque-4.2.9-r5.ebuild
+++ b/sys-cluster/torque/torque-4.2.9-r5.ebuild
@@ -172,12 +172,17 @@ pkg_postinst() {
 	elog "    If this is the first time torque has been installed, then you are not"
 	elog "ready to start the server.  Please refer to the documentation located at:"
 	elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if !  version_is_at_least 4.0 ${v}; then
 		echo
 		elog "Important 4.0+ updates"
 		elog "  - The on-wire protocol version has been changed."
 		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
 		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
 		elog "    trqauthd to your default runlevel."
-	fi
+		break
+		fi
+	done
 }
diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild
index 81660c9..ab039c8 100644
--- a/sys-cluster/torque/torque-6.0.1.ebuild
+++ b/sys-cluster/torque/torque-6.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit flag-o-matic eutils linux-info
+inherit flag-o-matic eutils linux-info versionator
 
 DESCRIPTION="Resource manager and queuing system based on OpenPBS"
 HOMEPAGE="http://www.adaptivecomputing.com/products/open-source/torque"
@@ -164,12 +164,17 @@ pkg_postinst() {
 	elog "    If this is the first time torque has been installed, then you are not"
 	elog "ready to start the server.  Please refer to the documentation located at:"
 	elog "http://docs.adaptivecomputing.com/torque/${PN//./-}/Content/topics/1-installConfig/initializeConfigOnServer.htm"
-	if [[ -z "${REPLACING_VERSIONS}" ]] || [[ ${REPLACING_VERSIONS} < 4 ]]; then
-		echo
-		elog "Important 4.0+ updates"
-		elog "  - The on-wire protocol version has been changed."
-		elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
-		elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
-		elog "    trqauthd to your default runlevel."
-	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if !  version_is_at_least 4.0 ${v}; then
+			echo
+			elog "Important 4.0+ updates"
+			elog "  - The on-wire protocol version has been changed."
+			elog "    Versions of Torque before 4.0.0 are no longer able to communicate."
+			elog "  - pbs_iff has been replaced by trqauthd, you will now need to add"
+			elog "    trqauthd to your default runlevel."
+			break
+		fi
+	done
 }