diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..397b4a7624e35fa60563a9c03b1213d93f7b6546
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 3a1dc89ed75999f281cac59ccdb29475b60c99e3..cf4655f7fe96ffdf1085c1b5002b721a68206da7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer : Bernhard Landauer <oberon@manjaro.org>
 
 pkgname=manjaro-system
-pkgver=$(date +%Y%m%d)
+pkgver=20191208
 pkgrel=1
 pkgdesc="Manjaro Linux System - Update script"
 arch=('any')
@@ -14,6 +14,10 @@ install=manjaro-update-system.sh
 source=('fsck.overlay')
 sha256sums=('e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855')
 
+pkgver() {
+    date +%Y%m%d
+}
+
 package() {
    install -Dm755 "$srcdir/fsck.overlay" "$pkgdir/usr/bin/fsck.overlay"
 }
diff --git a/manjaro-update-system.sh b/manjaro-update-system.sh
index 1919599846ada5a5f855ddfd923072ad3c4d60c4..25ddfb5d57f7c50065ff52085457db5816be0f07 100755
--- a/manjaro-update-system.sh
+++ b/manjaro-update-system.sh
@@ -224,16 +224,18 @@ post_upgrade() {
 		chmod 755 /var/lib/AccountsService/icons/
 	fi
 
-    # replace gtk3-classic with regular upstream gtk3
-    if [ "$(pacman -Qq | grep 'gtk3-classic' -m1)" == "gtk3-classic" ]; then
-        msg "replacing gkt3-classic with regular gtk3 ..."
-        msg "If you want to continue using the -classic or -mushroom version please install from the AUR."
-        rm /var/lib/pacman/db.lck &> /dev/null
-        pacman -Rdd --noconfirm gtk3-classic
-        pacman -S --noconfirm gtk3
-        if [ "$(pacman -Qq | grep 'lib32-gtk3-classic' -m1)" == "lib32-gtk3-classic" ]; then
-            pacman -Rdd --noconfirm lib32-gtk3-classic
-            pacman -S --noconfirm lib32-gtk3
+    # replace gtk3-classic with regular upstream gtk3 unless reinstalled since m-s 20191208-1
+    if [ "$(vercmp $(pacman -Q | grep 'manjaro-system' -m1 | cut -d' ' -f2) 20191208-1)" -lt 0 ]; then
+        if [ "$(pacman -Qq | grep 'gtk3-classic' -m1)" == "gtk3-classic" ]; then
+            msg "replacing gkt3-classic with regular gtk3 ..."
+            msg "If you want to continue using the -classic or -mushroom version please install from the AUR."
+            rm /var/lib/pacman/db.lck &> /dev/null
+            pacman -Rdd --noconfirm gtk3-classic
+            pacman -S --noconfirm gtk3
+            if [ "$(pacman -Qq | grep 'lib32-gtk3-classic' -m1)" == "lib32-gtk3-classic" ]; then
+                pacman -Rdd --noconfirm lib32-gtk3-classic
+                pacman -S --noconfirm lib32-gtk3
+            fi
         fi
     fi
 }