diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e06a93f..90e6f405 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,208 +1,209 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(KTORRENT)
 
 set (QT_MIN_VERSION "5.7.0")
 set (KF5_MIN_VERSION "5.15")
 
 find_package(ECM REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(GenerateExportHeader)
 include(ECMInstallIcons)
 include(ECMAddAppIcon)
 include(ECMMarkAsTest)
+include(ECMMarkNonGuiExecutable)
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
     Core
     DBus
     Network
     Script
     Widgets
 )
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
     Config
     ConfigWidgets
     CoreAddons
     Crash
     DBusAddons
     I18n
     IconThemes
     KIO
     Notifications
     NotifyConfig
     KCMUtils
     Parts
     Solid
     WidgetsAddons
     WindowSystem
     XmlGui
 )
 
 find_package(KF5DocTools ${KF5_MIN_VERSION})
 
 find_package(KF5Torrent 2.1 CONFIG REQUIRED)
 find_package(Boost REQUIRED)
 
 find_package(KF5TextWidgets ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5TextWidgets
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's IP Filter plugin"
 )
 if(KF5TextWidgets_FOUND)
   set(HAVE_KF5TextWidgets 1)
 endif()
 
 find_package(KF5Archive ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5Archive
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's scripting plugin"
 )
 if(KF5Archive_FOUND)
   set(HAVE_KF5Archive 1)
 endif()
 
 find_package(KF5ItemViews ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5ItemViews
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's scripting plugin"
 )
 if(KF5ItemViews_FOUND)
   set(HAVE_KF5ItemViews 1)
 endif()
 
 find_package(KF5Kross ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5Kross
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's scripting plugin"
 )
 if(KF5Kross_FOUND)
   set(HAVE_KF5Kross 1)
 endif()
 
 find_package(KF5Plotting ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5Plotting
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's statistics plugin"
 )
 if(KF5Plotting_FOUND)
   set(HAVE_KF5Plotting 1)
 endif()
 
 find_package(KF5Syndication)
 set_package_properties(KF5Syndication
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's syndication plugin"
 )
 if(KF5Syndication_FOUND)
   set(HAVE_KF5Syndication 1)
 endif()
 
 find_package(KF5WebKit ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5WebKit
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's search and syndication plugins"
 )
 if(KF5WebKit_FOUND)
   set(HAVE_KF5WebKit 1)
 endif()
 
 find_package(KF5DNSSD ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5DNSSD
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's Zeroconf plugin"
 )
 if(KF5DNSSD_FOUND)
   set(HAVE_KF5DNSSD 1)
 endif()
 
 find_package(KF5Completion ${KF5_REQUIRED_VERSION})
 set_package_properties(KF5Completion
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's UPnP plugin"
 )
 if(KF5Completion_FOUND)
   set(HAVE_KF5Completion 1)
 endif()
 
 find_package(LibKWorkspace CONFIG)
 set_package_properties(LibKWorkspace
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's shutdown plugin"
 )
 if(LibKWorkspace_FOUND)
   set(HAVE_LibKWorkspace 1)
 endif()
 
 find_package(Taglib)
 if(TAGLIB_FOUND)
   set(HAVE_Taglib 1)
 endif()
 #find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Multimedia MultimediaWidgets)
 find_package(Phonon4Qt5)
 set_package_properties(Taglib
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's multimedia plugin"
 )
 set_package_properties(Phonon4Qt5
   PROPERTIES
   TYPE OPTIONAL
   PURPOSE "Required for KTorrent's multimedia plugin"
 )
 
 #
 # checks for functions and stuff
 #
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 include(CheckTypeSize) #XFS
 
 
 # according to http://www.cmake.org/pipermail/cmake/2008-June/022381.html
 kde_enable_exceptions()
 
 add_definitions(
   -DQT_USE_QSTRINGBUILDER
   -DQT_NO_CAST_TO_ASCII
   -DQT_NO_CAST_FROM_ASCII
   -DQT_STRICT_ITERATORS
   -DQT_NO_URL_CAST_FROM_STRING
   -DQT_NO_CAST_FROM_BYTEARRAY
   -DQT_NO_CAST_TO_BYTEARRAY
 #   -DQT_NO_SIGNALS_SLOTS_KEYWORDS
   -DQT_USE_FAST_OPERATOR_PLUS
 )
 
 set (KTORRENT_DBUS_XML_DIR ${KTORRENT_SOURCE_DIR}/dbus_xml)
 set (KTORRENT_PLUGIN_INSTALL_DIR ${PLUGIN_INSTALL_DIR}/ktorrent)
 
 include_directories(
    ${Boost_INCLUDE_DIR}
 )
 
 add_subdirectory(libktcore)
 add_subdirectory(plugins)
 add_subdirectory(ktorrent)
 add_subdirectory(ktupnptest)
 #add_subdirectory(plasma)
 add_subdirectory(ktmagnetdownloader)
 if (KF5DocTools_FOUND)
     add_subdirectory(doc)
 endif()
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/ktmagnetdownloader/CMakeLists.txt b/ktmagnetdownloader/CMakeLists.txt
index 21a38332..e2ee2e08 100644
--- a/ktmagnetdownloader/CMakeLists.txt
+++ b/ktmagnetdownloader/CMakeLists.txt
@@ -1,5 +1,6 @@
 set(magnetdownloadtest_SRCS magnetdownloader.cpp magnettest.cpp)
 add_executable(ktmagnetdownloader ${magnetdownloadtest_SRCS})
 target_link_libraries(ktmagnetdownloader ktcore Qt5::Widgets Qt5::Network)
+ecm_mark_nongui_executable(ktmagnetdownloader)
 install(TARGETS ktmagnetdownloader ${INSTALL_TARGETS_DEFAULT_ARGS})