diff --git a/wine.changes b/wine.changes
index e948999..475b012 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Jan 12 16:08:11 UTC 2016 - i@marguerite.su
+
+- make sure wine desktop files installed under correct categories
+  * currently they land in "unspecific category"
+  * "Emulator" can only be used after "System" or "Game" according
+    to freedesktop specification
+  * "Wine" itself is not a valid category
+  * "Documentation" doesn't fit wine related stuff
+
 -------------------------------------------------------------------
 Sat Jan  9 10:22:46 UTC 2016 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index df057f9..fb951cb 100644
--- a/wine.spec
+++ b/wine.spec
@@ -166,7 +166,7 @@ make %{?_smp_mflags} all
 make install DESTDIR=%{buildroot}
 # install desktop file
 install -d %{buildroot}%{_datadir}/applications/
-%suse_update_desktop_file %{SOURCE4} Emulator
+%suse_update_desktop_file %{SOURCE4} System Emulator
 
 install -m 0644 %SOURCE4 %{buildroot}%{_datadir}/applications/
 install -m 0644 %SOURCE6 %{buildroot}%{_datadir}/applications/
@@ -190,10 +190,22 @@ cd ubuntuwine
         # Install application-specific desktop files
         install -d %{buildroot}%{_datadir}/applications
         install -c -m 644 *.desktop %{buildroot}%{_datadir}/applications/
+        sed -i "/X-SuSE-translate/d" %{buildroot}%{_datadir}/applications/*.desktop
 
         install -d %{buildroot}%{_datadir}/desktop-directories/
         install -c -m 644 *.directory %{buildroot}%{_datadir}/desktop-directories/
 
+	    # Correct desktop files' categories
+	    %suse_update_desktop_file -n -r wine-notepad Utility TextEditor
+	    %suse_update_desktop_file -n -r wine-uninstaller System Emulator
+	    %suse_update_desktop_file -n -r wine-winecfg System Emulator
+        %suse_update_desktop_file -n -r wine-regedit System Emulator
+        %suse_update_desktop_file -n -r wine-winehelp System Emulator
+        %suse_update_desktop_file -n -r wine-msi System Emulator
+        %suse_update_desktop_file -n -r wine-browsedrive System Emulator
+	    %suse_update_desktop_file -n -r wine-winefile System FileManager
+	    %suse_update_desktop_file -n -r wine-winemine Game BoardGame
+
         # Install icons
         install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/
         install -c -m 644 *.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/