diff --git a/keepass-desktop-integration.patch b/keepass-desktop-integration.patch
index ca99a8c..8a48f3c 100644
--- a/keepass-desktop-integration.patch
+++ b/keepass-desktop-integration.patch
@@ -43,7 +43,7 @@ diff -uNr keepass-2.26/dist/keepass.desktop keepass/dist/keepass.desktop
 +Icon=keepass
 +Terminal=false
 +Type=Application
-+StartupNotify=false
++StartupWMClass=keepass2
 +Categories=Utility;
 +MimeType=application/x-keepass2;
 diff -uNr keepass-2.26/dist/keepass.xml keepass/dist/keepass.xml
diff --git a/keepass.spec b/keepass.spec
index 44dee7c..43d7a5c 100644
--- a/keepass.spec
+++ b/keepass.spec
@@ -1,6 +1,6 @@
 Name:           keepass
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Password manager
 
 License:        GPLv2+
@@ -121,6 +121,9 @@ Documentation for KeePass, a free open source password manager.
 
 
 %changelog
+* Fri Oct 23 2015 Peter Oliver <rpm@mavit.org.uk> - 2.30-3
+- Set StartupWMClass, so that desktops can match the .desktop file with the windows mapped by the application.  Fixes #1266312.
+
 * Sun Aug  9 2015 Peter Oliver <rpm@mavit.org.uk> - 2.30-2
 - Add workaround for #1251756.