diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc777e2c6f..489b4065c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,7 +96,15 @@ if(PACKAGE_MODE)
     INSTALL(FILES     "${CMAKE_SOURCE_DIR}/bin/cheats_ws.zip" DESTINATION "${GAMEINDEX_DIR}")
     INSTALL(FILES     "${CMAKE_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
 
-    INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+    # set categories depending on system/distribution in pcsx2.desktop
+    if(openSUSE)
+        set(PCSX2_MENU_CATEGORIES "System;Emulator;")
+    else()
+        set(PCSX2_MENU_CATEGORIES "Game;Emulator;")
+    endif()
+    configure_file("${CMAKE_SOURCE_DIR}/linux_various/pcsx2.desktop.in" "${CMAKE_BINARY_DIR}/linux_various/pcsx2.desktop" @ONLY)
+
+    INSTALL(FILES "${CMAKE_BINARY_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
     INSTALL(FILES "${CMAKE_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
     INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_FAQ.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
     INSTALL(FILES "${CMAKE_SOURCE_DIR}/bin/docs/PCSX2_Readme.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
diff --git a/cmake/Pcsx2Utils.cmake b/cmake/Pcsx2Utils.cmake
index f38816b1c2..2b54ebd34c 100644
--- a/cmake/Pcsx2Utils.cmake
+++ b/cmake/Pcsx2Utils.cmake
@@ -22,9 +22,11 @@ function(detectOperatingSystem)
             file(STRINGS /etc/os-release OS_RELEASE)
             if ("${OS_RELEASE}" MATCHES "^.*ID=fedora.*$")
                 set(Fedora TRUE PARENT_SCOPE)
+                message(STATUS "Build Fedora specific")
             endif()
             if ("${OS_RELEASE}" MATCHES "^.*ID=.*suse.*$")
-                set(OpenSuse TRUE PARENT_SCOPE)
+                set(openSUSE TRUE PARENT_SCOPE)
+                message(STATUS "Build openSUSE specific")
             endif()
         endif()
     endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/linux_various/pcsx2.desktop b/linux_various/pcsx2.desktop.in
similarity index 82%
rename from linux_various/pcsx2.desktop
rename to linux_various/pcsx2.desktop.in
index ee1b3daace..20a173152a 100644
--- a/linux_various/pcsx2.desktop
+++ b/linux_various/pcsx2.desktop.in
@@ -7,4 +7,4 @@ GenericName=Playstation 2 Emulator
 Comment=Sony Playstation 2 emulator
 Exec=pcsx2
 Icon=pcsx2
-Categories=Game;Emulator;
+Categories=@PCSX2_MENU_CATEGORIES@
diff --git a/linux_various/pcsx2_system.desktop b/linux_various/pcsx2_system.desktop
deleted file mode 100644
index 1a96925add..0000000000
--- a/linux_various/pcsx2_system.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Terminal=false
-Type=Application
-Name=PCSX2
-GenericName=Playstation 2 Emulator
-Comment=Sony Playstation 2 emulator
-Exec=pcsx2
-Icon=pcsx2
-Categories=System;Emulator;
diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 7e0f3fe946..f2daeb5ccc 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -1,5 +1,5 @@
-if (OpenSuse)
-    # OpenSuse don't install wx in a standard library system
+if (openSUSE)
+    # openSUSE don't install wx in a standard library system
     # path. Let's bypass the dynamic linker and hardcode the path.
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 endif()
diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt
index ffdc37c95e..9bf18eb129 100644
--- a/plugins/spu2-x/src/CMakeLists.txt
+++ b/plugins/spu2-x/src/CMakeLists.txt
@@ -1,5 +1,5 @@
-if (OpenSuse)
-    # OpenSuse don't install wx in a standard library system
+if (openSUSE)
+    # openSUSE don't install wx in a standard library system
     # path. Let's bypass the dynamic linker and hardcode the path.
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 endif()
diff --git a/plugins/zzogl-pg/opengl/CMakeLists.txt b/plugins/zzogl-pg/opengl/CMakeLists.txt
index f16a881220..7c2864c96b 100644
--- a/plugins/zzogl-pg/opengl/CMakeLists.txt
+++ b/plugins/zzogl-pg/opengl/CMakeLists.txt
@@ -1,5 +1,5 @@
-if (OpenSuse)
-    # OpenSuse don't install wx in a standard library system
+if (openSUSE)
+    # openSUSE don't install wx in a standard library system
     # path. Let's bypass the dynamic linker and hardcode the path.
     set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
 endif()