diff --git a/.gitignore b/.gitignore
index f31348f..d81bc08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /light-locker-1.6.0.tar.bz2
+/light-locker-1.7.0.tar.bz2
diff --git a/b638e6c8f49a46b832d0135069b2c2c1dd7246e8.patch b/b638e6c8f49a46b832d0135069b2c2c1dd7246e8.patch
deleted file mode 100644
index 5d8b619..0000000
--- a/b638e6c8f49a46b832d0135069b2c2c1dd7246e8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b638e6c8f49a46b832d0135069b2c2c1dd7246e8 Mon Sep 17 00:00:00 2001
-From: Peter de Ridder <peter@xfce.org>
-Date: Tue, 7 Apr 2015 21:31:14 +0200
-Subject: [PATCH] Queue a resize of all windows on monitor change
-
----
- src/gs-manager.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/src/gs-manager.c b/src/gs-manager.c
-index 32eeb52..79a7dd6 100644
---- a/src/gs-manager.c
-+++ b/src/gs-manager.c
-@@ -424,6 +424,15 @@ on_screen_monitors_changed (GdkScreen *screen,
-                 gdk_flush ();
-                 gdk_x11_ungrab_server ();
-         }
-+
-+	for (l = manager->priv->windows; l != NULL; l = l->next) {
-+		GdkScreen *this_screen;
-+
-+		this_screen = gs_window_get_screen (GS_WINDOW (l->data));
-+		if (this_screen == screen) {
-+			gtk_widget_queue_resize (GTK_WIDGET (l->data));
-+		}
-+	}
- }
- 
- static void
diff --git a/light-locker.desktop.in b/light-locker.desktop.in
deleted file mode 100644
index 441306f..0000000
--- a/light-locker.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-_Name=Screen Locker
-_Comment=Launch screen locker program
-Icon=preferences-desktop-screensaver
-Exec=light-locker
-NoDisplay=true
-NotShowIn=GNOME;Unity;
diff --git a/light-locker.spec b/light-locker.spec
index a96b72c..41aa15a 100644
--- a/light-locker.spec
+++ b/light-locker.spec
@@ -1,16 +1,12 @@
 Name:           light-locker
-Version:        1.6.0
-Release:        4%{?dist}
+Version:        1.7.0
+Release:        1%{?dist}
 Summary:        A simple session-locker for lightdm 
 
 # unclear license: https://github.com/the-cavalry/light-locker/issues/33
 License:        GPLv2+
 URL:            https://github.com/the-cavalry/%{name}
 Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
-# Queue a resize of all windows on monitor change
-Patch0:         %{url}/commit/b638e6c8f49a46b832d0135069b2c2c1dd7246e8.patch
-# Fix some typos in desktop file > commits: 7c5f159, 1c23309, be2c892
-Source1:         https://raw.githubusercontent.com/cwickert/%{name}/master/src/%{name}.desktop.in
 
 #BuildRequires:  gtk2-devel
 BuildRequires:  gtk3-devel
@@ -36,16 +32,12 @@ It relies on lightdm for locking and unlocking your session.
 
 %prep
 %setup -q
-%patch0 -p1
-# FIXME remove forked desktop file when upstream merged it
-cp -p %{SOURCE1} src
-
 
 %build
 # FIXME build also gtk2? ( --with-gtk2 )
 # enforce lock on suspend as RedHat Security Response Team requests (see rhbz#614608 and 632978)
 %configure --enable-lock-on-suspend=on --disable-silent-rules --with-gtk3 
-make %{?_smp_mflags} V=1
+%make_build V=1
 
 %install
 %make_install
@@ -76,6 +68,9 @@ fi
 
 
 %changelog
+* Wed Oct 28 2015 Raphael Groner <projects.rg@smart.ms> - 1.7.0-1
+- new version (flagged as pre-release at upstream), rhbz#1275116
+
 * Sun Jul 05 2015 Raphael Groner <projects.rg@smart.ms> - 1.6.0-4
 - enforce lock on suspend
 
diff --git a/sources b/sources
index b324792..3587a93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f2425887d7bc8e86b53846f400d4ace  light-locker-1.6.0.tar.bz2
+1683af64cff7f9ff460a1fb670e170e8  light-locker-1.7.0.tar.bz2