diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh
index 30e7c6a80..80ba1ffde 100755
--- a/scripts/pentoo-updater.sh
+++ b/scripts/pentoo-updater.sh
@@ -2,16 +2,13 @@
 source /etc/profile
 env-update
 
-if [ -f /.catalyst_lock ]; then
-	if [ -f /tmp/envscript ]; then
-		source /tmp/envscript
-		emerge --info > /var/log/portage/emerge-info-$(date "+%Y%m%d").txt
-	fi
+if [ -n "${clst_target}" ]; then
+	emerge --info > /var/log/portage/emerge-info-$(date "+%Y%m%d").txt
 fi
 
 safe_exit() {
 	#I want a shell when I'm in catalyst but just an exit on failure for users
-	if [ -f /.catalyst_lock ]; then
+	if [ -n "${clst_target}" ]; then
 		/bin/bash
 	else
 		exit
@@ -25,14 +22,15 @@ eselect python set --python2 $(emerge --info | grep ^PYTHON_TARGETS | cut -d\" -
 eselect python set --python3 $(emerge --info | grep ^PYTHON_TARGETS | cut -d\" -f2 | cut -d" " -f 2 |sed 's#_#.#') || safe_exit
 python2.7 -c "from _multiprocessing import SemLock" || emerge -1 --buildpkg=y python:2.7
 python3.3 -c "from _multiprocessing import SemLock" || emerge -1 --buildpkg=y python:3.3
-python-updater -- --buildpkg=y --rebuild-exclude sys-devel/gdb --exclude sys-devel/gdb || safe_exit
 
 perl-cleaner --ph-clean --modules -- --buildpkg=y || safe_exit
 
+python-updater -- --buildpkg=y --rebuild-exclude sys-devel/gdb --exclude sys-devel/gdb || safe_exit
+
 emerge --deep --update --newuse -kb @world || safe_exit
 
 #if we are in catalyst, update the extra binpkgs
-if [ -f /.catalyst_lock ]; then
+if [ -n "${clst_target}" ]; then
 	#add kde and mate use flags
 	echo "pentoo/pentoo kde mate" >> /etc/portage/package.use
 	emerge --onlydeps --oneshot --deep --update --newuse pentoo/pentoo || safe_exit
@@ -47,11 +45,15 @@ etc-update --automode -5 || safe_exit
 #we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed
 emerge --depclean || safe_exit
 
-if [ -f /.catalyst_lock ]; then
+if [ -n "${clst_target}" ]; then
 	eclean-pkg || safe_exit
 	emaint binhost || safe_exit
 	#remove kde/mate use flags
 	rm /etc/portage/package.use
 fi
 
-/usr/local/portage/scripts/bug-461824.sh
+if [ -f /usr/local/portage/scripts/bug-461824.sh ]; then
+	/usr/local/portage/scripts/bug-461824.sh
+elif [ -f /var/lib/layman/pentoo/scripts/bug-461824.sh ]; then
+	/var/lib/layman/pentoo/scripts/bug-461824.sh
+fi