diff --git a/glib2-branding.changes b/glib2-branding.changes
index e179ff9..1420cd5 100644
--- a/glib2-branding.changes
+++ b/glib2-branding.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Dec 20 07:48:17 UTC 2017 - dimstar@opensuse.org
+
+- Revert "Update .gschema.override.in: evolution.desktop has been
+  renamed to org.gnome.Evolution.desktop.": This will only be valid
+  with GNOME 3.28.
+
+-------------------------------------------------------------------
+Tue Dec 19 12:49:42 UTC 2017 - dimstar@opensuse.org
+
+- Use variable flavor instead of BUILD_FLAVOR: obs is only
+  replacing the first occurence.
+
 -------------------------------------------------------------------
 Fri Dec 15 12:21:18 UTC 2017 - dimstar@opensuse.org
 
diff --git a/glib2-branding.gschema.override.in b/glib2-branding.gschema.override.in
index 1d2530f..2c9b088 100644
--- a/glib2-branding.gschema.override.in
+++ b/glib2-branding.gschema.override.in
@@ -72,8 +72,8 @@ help = "Help"
 
 [org.gnome.shell]
 ## Default apps shown in the gnome-shell dash
-@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'org.gnome.Evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]
-@@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'org.gnome.Evolution.desktop', 'pidgin.desktop', 'gnome-photos.desktop', 'startcenter.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop', 'yelp.desktop' ]
+@@IF_openSUSE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'gnome-music.desktop', 'shotwell.desktop', 'writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop' ]
+@@IF_SLE@@favorite-apps = [ 'firefox.desktop', 'evolution.desktop', 'pidgin.desktop', 'gnome-photos.desktop', 'startcenter.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Documents.desktop', 'yelp.desktop' ]
 @@IF_SLE@@## Default extensions that are enabled
 @@IF_SLE@@enabled-extensions = [ 'alternative-status-menu@gnome-shell-extensions.gcampax.github.com' ]
 
diff --git a/glib2-branding.spec b/glib2-branding.spec
index 5aa5823..ae8ffdc 100644
--- a/glib2-branding.spec
+++ b/glib2-branding.spec
@@ -24,7 +24,7 @@ ExclusiveArch:  %nil
 %else
 %define branding_name %{flavor}
 %define dash -
-%if "@BUILD_FLAVOR@" == "SLE"
+%if "%{flavor}" == "SLE"
 %define build_SLE 1
 %else
 %define build_openSUSE 1