diff --git a/recipes-kf5/obsolete/kdelibs4support.inc b/recipes-kf5/obsolete/kdelibs4support.inc
index 6ad7bf6..e8001d6 100644
--- a/recipes-kf5/obsolete/kdelibs4support.inc
+++ b/recipes-kf5/obsolete/kdelibs4support.inc
@@ -1,69 +1,70 @@
 DESCRIPTION = "KDELibs4Support"
 HOMEPAGE = "https://api.kde.org/frameworks/kdelibs4support/html/index.html"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
     "
 PR = "r0"
 
 DEPENDS = " \
     qtbase \
     qtsvg \
     kcompletion \
     kconfigwidgets \
     kcrash \
     kded \
     kdesignerplugin \
     kdesignerplugin-native \
+    kdoctools \
+    kdoctools-native \
     kemoticons \
     kglobalaccel \
     kiconthemes \
     kio \
     knotifications \
     kparts \
     kunitconversion \
     liburi-perl-native \
     openssl \
 "
 
 SRC_URI = " \
     git://anongit.kde.org/kdelibs4support;nobranch=1 \
-    file://0001-optional-kdoctools.patch \
     file://0003-unexport-kf5-config.patch \
 "
 S = "${WORKDIR}/git"
 
 EXTRA_OECMAKE += " -DHAVE_GOOD_GETADDRINFO=ON"
 
 inherit cmake_kf5
 inherit gettext
 inherit python3native
 inherit perlnative
 
 do_compile_prepend() {
     # desktoptojson needs to find installed service type files
     export XDG_DATA_DIRS=${STAGING_DATADIR}:$XDG_DATA_DIRS
 }
 
 do_install_append_class-target() {
     rm -rf ${D}${libdir}/plugins/designer
 }
 
 FILES_${PN} += " \
     ${libdir}/plugins/*.so \
     ${libdir}/plugins/kf5/kio/*.so \
     ${libdir}/plugins/kf5/kded/*.so \
     ${datadir}/kservices5/qimageioplugins/*.desktop \
     ${datadir}/kf5/kssl/ca-bundle.crt \
     ${datadir}/kf5/locale/currency/*.desktop \
     ${datadir}/kf5/locale/countries/*.desktop \
     ${datadir}/kf5/locale/countries/*/country.desktop \
     ${datadir}/kf5/locale/countries/*/flag.png \
     ${datadir}/kf5/kdoctools/customization/catalog4.xml \
     ${datadir}/kf5/kdoctools/customization/dtd/kdex.dtd \
 "
 
 FILES_${PN}-dev += " \
     ${datadir}/kf5/widgets/pics/*.png \
 "
 
 RDEPENDS_kdelibs4support += "perl"
diff --git a/recipes-kf5/obsolete/kdelibs4support/0001-optional-kdoctools.patch b/recipes-kf5/obsolete/kdelibs4support/0001-optional-kdoctools.patch
deleted file mode 100644
index 8bbd6f4..0000000
--- a/recipes-kf5/obsolete/kdelibs4support/0001-optional-kdoctools.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 36f441ba50af516079ceaa888164903bc1ce881f
-Author: Volker Krause <vkrause@kde.org>
-Date:   Mon Jan 1 18:35:55 2018 +0100
-
-    Make kdoctools dependency optional
-    
-    Same as in other frameworks, makes cross-compiling easier.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ed87a14..7826413d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,7 +28,7 @@ find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5Crash ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5DesignerPlugin ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GlobalAccel ${KF5_DEP_VERSION} REQUIRED)
--find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED)
-+find_package(KF5DocTools ${KF5_DEP_VERSION})
- find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED)
-@@ -153,11 +153,15 @@ install(
- 
- if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
-     ki18n_install(po)
--    kdoctools_install(po)
-+    if (KF5DocTools_FOUND)
-+        kdoctools_install(po)
-+    endif()
- endif()
- add_subdirectory(cmake)
- add_subdirectory(data)
--add_subdirectory(docs)
-+if (KF5DocTools_FOUND)
-+    add_subdirectory(docs)
-+endif()
- add_subdirectory(src)
- 
- if (BUILD_TESTING)
-diff --git a/KF5KDELibs4SupportConfig.cmake.in b/KF5KDELibs4SupportConfig.cmake.in
-index b5194f94..cf3f2aca 100644
---- a/KF5KDELibs4SupportConfig.cmake.in
-+++ b/KF5KDELibs4SupportConfig.cmake.in
-@@ -12,7 +12,9 @@ find_dependency(KF5ConfigWidgets "@KF5_DEP_VERSION@")
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- find_dependency(KF5Crash "@KF5_DEP_VERSION@")
- find_dependency(KF5DesignerPlugin "@KF5_DEP_VERSION@")
--find_dependency(KF5DocTools "@KF5_DEP_VERSION@")
-+if(@KF5DocTools_FOUND@)
-+    find_dependency(KF5DocTools "@KF5_DEP_VERSION@")
-+endif()
- find_dependency(KF5Emoticons "@KF5_DEP_VERSION@")
- find_dependency(KF5GuiAddons "@KF5_DEP_VERSION@")
- find_dependency(KF5IconThemes "@KF5_DEP_VERSION@")
-diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
-index ca868ad9..5c50a2cf 100644
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -485,7 +485,9 @@ endmacro (KDE4_ADD_LIBRARY _target_NAME _lib_TYPE)
- include("${KF5Auth_DIR}/KF5AuthMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDECoreMacros.cmake")
- include("${CMAKE_CURRENT_LIST_DIR}/KDEUIMacros.cmake")
--include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
-+if (KF5DocTools_FOUND)
-+    include("${KF5DocTools_DIR}/KF5DocToolsMacros.cmake")
-+endif()
- include("${KF5DesignerPlugin_DIR}/KF5DesignerPluginMacros.cmake")
- 
- # functions deprecated, they still should work