diff -Nru kdbusaddons-5.35.0/CMakeLists.txt kdbusaddons-5.36.0/CMakeLists.txt
--- kdbusaddons-5.35.0/CMakeLists.txt	2017-06-03 10:03:50.000000000 +0000
+++ kdbusaddons-5.36.0/CMakeLists.txt	2017-07-02 07:59:36.000000000 +0000
@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(KF5_VERSION "5.35.0") # handled by release scripts
+set(KF5_VERSION "5.36.0") # handled by release scripts
 project(KDBusAddons VERSION ${KF5_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 5.35.0  NO_MODULE)
+find_package(ECM 5.36.0  NO_MODULE)
 set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules")
 feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -25,6 +25,7 @@
 include(ECMSetupVersion)
 include(ECMGenerateHeaders)
 include(ECMMarkNonGuiExecutable)
+include(ECMAddQch)
 
 include(ECMPoQmTools)
 
@@ -40,6 +41,8 @@
     set(HAVE_X11 FALSE)
 endif()
 
+option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF)
+add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)")
 
 if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
     ecm_install_po_files_as_qm(po)
@@ -52,6 +55,16 @@
 # create a Config.cmake and a ConfigVersion.cmake file and install them
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DBusAddons")
 
+if (BUILD_QCH)
+    ecm_install_qch_export(
+        TARGETS KF5DBusAddons_QCH
+        FILE KF5DBusAddonsQchTargets.cmake
+        DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+        COMPONENT Devel
+    )
+    set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5DBusAddonsQchTargets.cmake\")")
+endif()
+
 configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5DBusAddonsConfig.cmake.in"
                               "${CMAKE_CURRENT_BINARY_DIR}/KF5DBusAddonsConfig.cmake"
                               INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
diff -Nru kdbusaddons-5.35.0/debian/changelog kdbusaddons-5.36.0/debian/changelog
--- kdbusaddons-5.35.0/debian/changelog	2017-06-12 21:58:42.000000000 +0000
+++ kdbusaddons-5.36.0/debian/changelog	2017-07-11 22:53:28.000000000 +0000
@@ -1,3 +1,9 @@
+kdbusaddons (5.36.0-0ubuntu1) artful; urgency=low
+
+  * New upstream release (5.36.0)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Tue, 11 Jul 2017 23:53:28 +0100
+
 kdbusaddons (5.35.0-0ubuntu1) artful; urgency=low
 
   * New upstream release (5.35.0)
diff -Nru kdbusaddons-5.35.0/debian/control kdbusaddons-5.36.0/debian/control
--- kdbusaddons-5.35.0/debian/control	2017-06-12 21:58:42.000000000 +0000
+++ kdbusaddons-5.36.0/debian/control	2017-07-11 22:53:28.000000000 +0000
@@ -6,7 +6,7 @@
 Build-Depends: cmake (>= 2.8.12),
                dbus-x11,
                debhelper (>= 9),
-               extra-cmake-modules (>= 5.35.0~),
+               extra-cmake-modules (>= 5.36.0~),
                libqt5x11extras5-dev (>= 5.6.1~),
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.6.1~),
diff -Nru kdbusaddons-5.35.0/KF5DBusAddonsConfig.cmake.in kdbusaddons-5.36.0/KF5DBusAddonsConfig.cmake.in
--- kdbusaddons-5.35.0/KF5DBusAddonsConfig.cmake.in	2017-06-03 10:03:50.000000000 +0000
+++ kdbusaddons-5.36.0/KF5DBusAddonsConfig.cmake.in	2017-07-02 07:59:36.000000000 +0000
@@ -5,4 +5,4 @@
 
 
 include("${CMAKE_CURRENT_LIST_DIR}/KF5DBusAddonsTargets.cmake")
-
+@PACKAGE_INCLUDE_QCHTARGETS@
diff -Nru kdbusaddons-5.35.0/src/CMakeLists.txt kdbusaddons-5.36.0/src/CMakeLists.txt
--- kdbusaddons-5.35.0/src/CMakeLists.txt	2017-06-03 10:03:50.000000000 +0000
+++ kdbusaddons-5.36.0/src/CMakeLists.txt	2017-07-02 07:59:36.000000000 +0000
@@ -82,6 +82,27 @@
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons COMPONENT Devel
 )
 
+if(BUILD_QCH)
+    ecm_add_qch(
+        KF5DBusAddons_QCH
+        NAME KDBusAddons
+        BASE_NAME KF5DBusAddons
+        VERSION ${KF5_VERSION}
+        ORG_DOMAIN org.kde
+        SOURCES # using only public headers, to cover only public API
+            ${KDBusAddons_HEADERS}
+        MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
+        LINK_QCHS
+            Qt5DBus_QCH
+            Qt5Core_QCH
+        BLANK_MACROS
+            KDBUSADDONS_EXPORT
+            KDBUSADDONS_DEPRECATED
+        TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
+        COMPONENT Devel
+    )
+endif()
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KDBusAddons LIB_NAME KF5DBusAddons DEPS "dbus" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KDBusAddons)