diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh
index d6392dc20..bb4e8b297 100755
--- a/scripts/pentoo-updater.sh
+++ b/scripts/pentoo-updater.sh
@@ -179,12 +179,7 @@ safe_exit() {
   fi
 }
 
-check_profile
-if [ -n "${clst_target}" ]; then #we are in catalyst
-  mkdir -p /var/log/portage/emerge-info/
-  emerge --info > /var/log/portage/emerge-info/emerge-info-$(date "+%Y%m%d").txt
-else #we are on a user system
-  eselect python update
+do_sync() {
   if ! emerge --sync; then
     if [ -e /etc/portage/repos.conf/pentoo.conf ] && grep -q pentoo.asc /etc/portage/repos.conf/pentoo.conf; then
       printf "Pentoo repo key incorrectly defined, fixing..."
@@ -201,6 +196,15 @@ else #we are on a user system
       exit 1
     fi
   fi
+}
+
+check_profile
+if [ -n "${clst_target}" ]; then #we are in catalyst
+  mkdir -p /var/log/portage/emerge-info/
+  emerge --info > /var/log/portage/emerge-info/emerge-info-$(date "+%Y%m%d").txt
+else #we are on a user system
+  eselect python update
+  [ "${NO_SYNC}" = "true" ] || do_sync
   check_profile
 	if [ -d /var/db/repos/pentoo ] && [ -d /var/lib/layman/pentoo ]; then
     printf "Pentoo now manages it's overlay through portage instead of layman.\n"
@@ -302,11 +306,11 @@ emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
 #we need to do the clean BEFORE we drop the extra flags otherwise all the packages we just built are removed
 currkern="$(uname -r)"
 if [ "${currkern/pentoo/}" != "${currkern}" ]; then
-  emerge --depclean --exclude "sys-kernel/pentoo-sources:${currkern/-pentoo/}" || safe_exit
+  EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS/--verbose //}" emerge --depclean --exclude "sys-kernel/pentoo-sources:${currkern/-pentoo/}" || safe_exit
 elif [ "${currkern/gentoo/}" != "${currkern}" ]; then
-  emerge --depclean --exclude "sys-kernel/gentoo-sources:${currkern/-gentoo/}" || safe_exit
+  EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS/--verbose //}" emerge --depclean --exclude "sys-kernel/gentoo-sources:${currkern/-gentoo/}" || safe_exit
 else
-  emerge --depclean || safe_exit
+  EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS/--verbose //}" emerge --depclean || safe_exit
 fi
 
 if portageq list_preserved_libs /; then
diff --git a/sys-kernel/pentoo-sources/Manifest b/sys-kernel/pentoo-sources/Manifest
index 76ef91430..7e2e2ad5b 100644
--- a/sys-kernel/pentoo-sources/Manifest
+++ b/sys-kernel/pentoo-sources/Manifest
@@ -13,9 +13,9 @@ DIST genpatches-4.19-6.extras.tar.xz 17468 BLAKE2B b1be298b8676f197c5c086da19329
 DIST genpatches-4.20-7.base.tar.xz 206500 BLAKE2B 6c319de96dcafcebaaa1477f4cb3116749d8443e1b2ee50ad502f7693a7f15f398eedc4beb96e0d33d748d6508d63a17fbb1734accec515fec291ee4bb000f92 SHA512 4776b9a193eea2623be4c131e83126b5763b9a7e578585f6f777eeaaa346199414cdb1b1ee0ed5e3f7898e35a3b4303bdd6584e3454db616d299157a3107e57f
 DIST genpatches-4.20-7.experimental.tar.xz 5216 BLAKE2B 1813ee1abee9f62a1e1b75b8cbc9a69815f77b04929e4273d35594283abb76a5c188a9cad5068b1215cf956a81c3b1f05c44d16f13b2486d2ef44f91c067918b SHA512 32d285ab3bf91dee85658c9013a5c00a6ecbfaf6c281eef515275ac5530bf1e75f36aa4b5af87369a0fa6500e30525561e1b475d9fd80f1a04f5292bac8714a3
 DIST genpatches-4.20-7.extras.tar.xz 3276 BLAKE2B 658d34dfa1ec5e3b0d0013c38636f313a4e653d90be00b42f8224790a7e35787b83925101cd25e8154767adb2d7c4272ddda77ac887631407420cf7fb77f5779 SHA512 6c76ed48816b1c94da76d312820f60a12f0a01dea31e5b1dadea0270f297a81d6cd1740672a354a15b88577c708b4ddb94fe0086015242dbc59631ca3fe627d9
-DIST genpatches-5.0-3.base.tar.xz 34292 BLAKE2B e6ac48b519802739b54081502d7d4f1b80aa5988aa04ba206c52c5991b29cbdd39d13c8a8da7a876e9dafc7d9f33f90eb866cfae2f8e8a747a358661520c7643 SHA512 ea6c85157211b7ac7d448d6b9107f6bf3dec9d8c4e1509ef463d1f1beb661cffb16d24c1729037d37ef41335b4d0c88ab5467f0dca422e8591d4302e447ba0a0
-DIST genpatches-5.0-3.experimental.tar.xz 5800 BLAKE2B 5039b3847980ada995bbc811ed42080ceaeb024f01baf80bf020fd2915d79bd92f183a4cd6b73bc08de192f99930c225a139ad370bcfb5b0151695c256b7e1f8 SHA512 0a8ccd5b4232926e89755cff71eacc83ad5cea8922518c9dbe7049d866dd60c282d6c7f26df6b42b7d4678fdd369a5b15d775b8e948eb8ec844fba911a866deb
-DIST genpatches-5.0-3.extras.tar.xz 1724 BLAKE2B 21fd7595e03e7a97fdd1b06031a8404b6d4010db4bb404cb81cec99ebfca9e350990e3b10295b827fcd4b9354125ee0e1e12466ff278aab9a5dfc184e7f6db4f SHA512 993f46873596b2093d23305be2ab72b1121055a18049ec4e1c63f592daded68abb4724e7a51784858c7999bc114b3559fa3434cb148714f0decd64da80bfd700
+DIST genpatches-5.0-6.base.tar.xz 144128 BLAKE2B a34fca2447ec08d2918dc32c938f5219aca91c06c7b12acc9b8edca056b346dc86841af540897ee5ce1063a718d8d072d03b08c200cb8550275373a92c733666 SHA512 8684ca591d0b4afd1606592e5383bbf0c87979298d991c0dfaee04a2f14368bbc8d1aba4f604543a6c7607c4eedde21a560a1fb29d87af30877b7f83a4bfdc27
+DIST genpatches-5.0-6.experimental.tar.xz 5804 BLAKE2B d92515fff5a65a8d35f461df220989dc74a65b4142820a0bc70af3cfb2fbc85f42e28ca5b3ca61ae390b02f71427331fd3ea7c1b0704ade91f292f071986894c SHA512 a6a9a2745170ff36d127cded594dd8eebe832c9095db50c593cd359f2dc0b5add8e973918e77f86f5bc5a62eb3a0050707f86eb3f100336b4a1e6edacf6d2442
+DIST genpatches-5.0-6.extras.tar.xz 1724 BLAKE2B 29b17ac8ba5bf2f6b6e19e0f3055fc39ef816a29ec1d0b3390408ddb24354cfc62695fb893c2166a09a4250f9501ac75d82b3ff721e25eb2b3786669500c49a3 SHA512 d94218deca195ac6f3edd984d8c6b955479cc7fd352329a6e1cae08d715e4ffe45bf6fa27715b1f0ad8c6e340c0b584f89714943d3de719393f74d1eb4af1a43
 DIST linux-4.16.tar.xz 103020152 BLAKE2B c7f7b36280b74b2112a098733680e1e93c4f99571099d471b2dde5f7a746d9b9fab5112fffe3b7978c40f15ecaa33203eeeeea98c2158fab2d5857ece5d74f9f SHA512 ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 DIST linux-4.17.tar.xz 102165892 BLAKE2B b9e1fe2c063d2761b4d54594b841f6591fd6f5b634a402c07e0fa5518a2b271293d97c5a7a8e3c30c9c4d78df16bf20a4f0befe998c9a9393bb3290d2df1dda3 SHA512 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 DIST linux-4.18.tar.xz 101781564 BLAKE2B 138bdc49dc8871e5566b5e23a9e5ed0e68fff480a7a04fc659a9efe2d4bcc778ac01368a32bc5d1dbde870102ce7294b9d315f81c4e6e762ee781135e83033f2 SHA512 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
diff --git a/sys-kernel/pentoo-sources/pentoo-sources-5.0.2.ebuild b/sys-kernel/pentoo-sources/pentoo-sources-5.0.5.ebuild
similarity index 98%
rename from sys-kernel/pentoo-sources/pentoo-sources-5.0.2.ebuild
rename to sys-kernel/pentoo-sources/pentoo-sources-5.0.5.ebuild
index ed3730add..f33e63100 100644
--- a/sys-kernel/pentoo-sources/pentoo-sources-5.0.2.ebuild
+++ b/sys-kernel/pentoo-sources/pentoo-sources-5.0.5.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="3"
+K_GENPATCHES_VER="6"
 
 inherit kernel-2
 detect_version