diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e343d071a5..32e0f99488 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,94 +1,95 @@
 find_package(KF5Plasma CONFIG)
 set_package_properties(KF5Plasma PROPERTIES
     PURPOSE "Plasma libraries for enabling the plasma addons"
     URL "http://www.kde.org"
     TYPE OPTIONAL)
 if(KF5Plasma_FOUND)
     add_subdirectory(plasma)
 endif()
 
 option(KDEVELOP_SINGLE_APP "Use QtSingleApplication as KDevelop's base" OFF)
 
 set(kdevelop_SRCS  main.cpp kdevideextension.cpp)
 
 ecm_qt_declare_logging_category(kdevelop_SRCS
     HEADER debug.h
     IDENTIFIER APP
     CATEGORY_NAME "kdevelop.app"
 )
 qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
 
 #TODO: remove CMAKE_CURRENT_SOURCE_DIR prefix when ECM is fixed
 set(kdevelop_ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/16-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/32-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/48-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/64-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/128-apps-kdevelop.png
     ${CMAKE_CURRENT_SOURCE_DIR}/icons/256-apps-kdevelop.png
 )
 
 ecm_install_icons(ICONS ${kdevelop_ICONS}
     DESTINATION ${KDE_INSTALL_ICONDIR})
     
 ecm_add_app_icon(kdevelop_SRCS ICONS
     ${kdevelop_ICONS})
 
 qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
 add_executable(kdevelop ${kdevelop_SRCS} )
 target_link_libraries(kdevelop
     KDev::Interfaces
     KDev::Shell
     KDev::Util
 
     KF5::Declarative
     KF5::IconThemes
     KF5::Crash
 )
 IF(APPLE)
     target_link_libraries(kdevelop "-framework CoreFoundation")
 ENDIF()
 if(KDEVELOP_SINGLE_APP)
     add_subdirectory(3rdparty/qtsingleapplication)
     target_link_libraries(kdevelop qtsingleapplication)
 endif()
 
 install(TARGETS kdevelop ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 install(FILES kdevelop! DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 configure_file(start-kdevelop.py.in ${CMAKE_CURRENT_BINARY_DIR}/start-kdevelop.py @ONLY)
 
 option(INSTALL_KDEVELOP_LAUNCH_WRAPPER "Install a wrapper script that sets required environment variables. Only useful when installing into a separate prefix" OFF)
 if(INSTALL_KDEVELOP_LAUNCH_WRAPPER)
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/start-kdevelop.py DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 endif()
 
 if (WIN32)
 install(FILES windows/kdevelop-msvc.bat DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
 endif (WIN32)
 
 if (APPLE)
     # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake,
     # so has to be set for all targets in this cmake file
     set(MACOSX_BUNDLE_DISPLAY_NAME KDevelop)
     # We provide our own Info.plist to disable AppNap for KDevelop:
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "KDevelop")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_INFO_STRING "The KDevelop Integrated Development Environment")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "KDevelop ${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_ICON_FILE "kdevelop_SRCS.icns")
     set_target_properties(kdevelop PROPERTIES MACOSX_BUNDLE_COPYRIGHT "KDevelop Team")
 endif (APPLE)
 
 
 ########### install files ###############
 
 install( PROGRAMS org.kde.kdevelop.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
 install( PROGRAMS org.kde.kdevelop_ps.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+install( PROGRAMS org.kde.kdevelop_kdev4.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
 install( FILES kdevelop.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
 install( FILES kdevelop.xml DESTINATION ${KDE_INSTALL_MIMEDIR} )
 update_xdg_mimetypes( ${KDE_INSTALL_MIMEDIR} )
diff --git a/app/org.kde.kdevelop.desktop b/app/org.kde.kdevelop.desktop
index f0966a0585..084ac4eac3 100644
--- a/app/org.kde.kdevelop.desktop
+++ b/app/org.kde.kdevelop.desktop
@@ -1,75 +1,75 @@
 [Desktop Entry]
 Type=Application
-Exec=kdevelop -p %u
-MimeType=application/x-kdevelop;
+Exec=kdevelop
+MimeType=
 Icon=kdevelop
 X-DocPath=kdevelop/index.html
 Terminal=false
 Name=KDevelop
 Name[ca]=KDevelop
 Name[ca@valencia]=KDevelop
 Name[cs]=KDevelop
 Name[de]=KDevelop
 Name[el]=KDevelop
 Name[en_GB]=KDevelop
 Name[eo]=KDevelop
 Name[es]=KDevelop
 Name[et]=KDevelop
 Name[fi]=KDevelop
 Name[fr]=KDevelop
 Name[gl]=KDevelop
 Name[hu]=KDevelop
 Name[it]=KDevelop
 Name[nl]=KDevelop
 Name[pl]=KDevelop
 Name[pt]=KDevelop
 Name[pt_BR]=KDevelop
 Name[ru]=KDevelop
 Name[sk]=KDevelop
 Name[sl]=KDevelop
 Name[sv]=KDevelop
 Name[tr]=KDevelop
 Name[uk]=KDevelop
 Name[x-test]=xxKDevelopxx
 Name[zh_CN]=KDevelop
 GenericName=Integrated Development Environment
 GenericName[ar]=بيئة تطوير متكاملة
 GenericName[bs]=Integrisano razvojno okruženje
 GenericName[ca]=Entorn integrat de desenvolupament
 GenericName[ca@valencia]=Entorn integrat de desenvolupament
 GenericName[cs]=Integrované Vývojové Prostředí
 GenericName[da]=Integreret udviklingsmiljø (IDE)
 GenericName[de]=Integrierte Entwicklungsumgebung
 GenericName[el]=ολοκληρωμένο περιβάλλον ανάπτυξης
 GenericName[en_GB]=Integrated Development Environment
 GenericName[es]=Entorno de desarrollo integrado
 GenericName[et]=Integreeritud arenduskeskkond
 GenericName[fi]=Integroitu kehitysympäristö
 GenericName[fr]=Environnement de Développement Intégré
 GenericName[ga]=Timpeallacht Chomhtháite Fhorbartha
 GenericName[gl]=Ambiente de desenvolvemento integrado
 GenericName[hne]=एकीकृत डेवलपमेंट वातावरन
 GenericName[hu]=Integrált fejlesztői környezet
 GenericName[it]=Ambiente di sviluppo integrato
 GenericName[ja]=統合開発環境
 GenericName[kk]=Біріктірілген құрастыру ортасы
 GenericName[km]=Development Environment ដែល​បាន​រួមបញ្ចូល
 GenericName[lt]=Integruota programavimo aplinka
 GenericName[lv]=Integrēta izstrādes vide
 GenericName[nb]=Integrert utviklingsmiljø
 GenericName[nds]=Programmsmeed
 GenericName[nl]=Geïntegreerde ontwikkelomgeving
 GenericName[pl]=Zintegrowane środowisko programistyczne
 GenericName[pt]=Ambiente de Desenvolvimento Integrado
 GenericName[pt_BR]=Ambiente Integrado de Desenvolvimento
 GenericName[ru]=Интегрированная среда разработки
 GenericName[sk]=Integrované vývojové prostredie
 GenericName[sl]=Integrirano razvojno okolje
 GenericName[sv]=Integrerad utvecklingsmiljö
 GenericName[tr]=Bütünleşik Geliştirme Ortamı
 GenericName[ug]=يۈرۈشلەشتۈرۈلگەن ئىجادىيەت مۇھىتى
 GenericName[uk]=Комплексне середовище розробки
 GenericName[x-test]=xxIntegrated Development Environmentxx
 GenericName[zh_CN]=集成开发环境
 GenericName[zh_TW]=整合開發環境
 Categories=Qt;KDE;Development;IDE;
diff --git a/app/org.kde.kdevelop_kdev4.desktop b/app/org.kde.kdevelop_kdev4.desktop
new file mode 100644
index 0000000000..04f1d377af
--- /dev/null
+++ b/app/org.kde.kdevelop_kdev4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Exec=kdevelop -p %u
+MimeType=application/x-kdevelop;
+Icon=kdevelop
+Terminal=false
+Name=KDevelop
+GenericName=Integrated Development Environment
+Categories=Qt;KDE;Development;IDE;
+NoDisplay=true