diff --git a/.gitignore b/.gitignore
index e04c276..1f85b08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mate-settings-daemon-1.4.0.tar.xz
 /mate-settings-daemon-1.5.0.tar.xz
 /mate-settings-daemon-1.5.3.tar.xz
+/mate-settings-daemon-1.5.4.tar.xz
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index ed7bce5..7caf729 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           mate-settings-daemon
-Version:        1.5.3
-Release:        5%{?dist}
+Version:        1.5.4
+Release:        1%{?dist}
 Summary:        MATE Desktop settings daemon
 License:        GPLv2+
 URL:            http://mate-desktop.org
@@ -24,10 +24,6 @@ BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 Requires: gsettings-desktop-schemas
 Requires: mate-icon-theme
 
-#Fix CVE-2012-5560 and stop generating version specific libdirs
-#https://github.com/mate-desktop/mate-settings-daemon/pull/22
-#Remove archlinux bits from configure.ac
-Patch0: commit_rollup.patch
 
 %description
 MATE Desktop settings daemon
@@ -41,15 +37,19 @@ Development files for mate-settings-daemon
 
 %prep
 %setup -q
-%patch0 -p1 -b .commit_rollup.patch
 NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure --disable-static \
-           --enable-polkit \
-           --with-x \
-           --with-nssdb
+%configure \
+    --with-x  \
+    --enable-gstreamer  \
+    --enable-polkit  \
+    --disable-schemas-compile  \
+    --with-gnu-ld  \
+    --with-x  \
+    --with-nssdb  \
+
 make %{?_smp_mflags} V=1
 
 
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Mon Dec 03 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.4-1
+- Latest upstream release
+
 * Fri Nov 23 2012 Dan Mashal <dan.mashal@fedoraproject.org> - 1.5.3-5
 - Remove archlinux configure.ac bits.
 - REALLY fix CVE-2012-5560
diff --git a/sources b/sources
index 7a22d87..5bad455 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3ce8546dcdfbd6fd0578e02b0cab82d  mate-settings-daemon-1.5.3.tar.xz
+d60acd136d4d7b273dc5cb6033beba98  mate-settings-daemon-1.5.4.tar.xz