diff --git a/CMakeLists.txt b/CMakeLists.txt
index b25cc79..dd1d77c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,11 +18,11 @@ set(PACKAGE ${CMAKE_PROJECT_NAME})
 set(GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
 
 find_package(PkgConfig REQUIRED)
+find_package(GDbus)
 include(GNUInstallDirs)
 include(CheckIncludeFile)
 include(CheckFunctionExists)
 include(UseGlibGeneration)
-include(UseGdbusCodegen)
 include(UseConstantBuilder)
 
 # Workaround for libexecdir on debian
diff --git a/cmake/UseGdbusCodegen.cmake b/cmake/UseGdbusCodegen.cmake
deleted file mode 100644
index aa23ca3..0000000
--- a/cmake/UseGdbusCodegen.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-if(POLICY CMP0011)
-  cmake_policy(SET CMP0011 NEW)
-endif(POLICY CMP0011)
-
-find_program(GDBUS_CODEGEN NAMES gdbus-codegen DOC "gdbus-codegen executable")
-if(NOT GDBUS_CODEGEN)
-  message(FATAL_ERROR "Excutable gdbus-codegen not found")
-endif()
-
-function(add_gdbus_codegen)
-  set(_one_value OUTFILES NAME PREFIX NAMESPACE SERVICE_XML)
-  set(_multi_value DEPENDS)
-  cmake_parse_arguments (arg "" "${_one_value}" "${_multi_value}" ${ARGN})
-
-  if(arg_PREFIX)
-    set(PREFIX --interface-prefix ${arg_PREFIX})
-  endif()
-  
-  if(arg_NAMESPACE)
-    set(NAMESPACE --c-namespace ${arg_NAMESPACE})
-  endif()
-  
-  add_custom_command(
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c"
-    COMMAND "${GDBUS_CODEGEN}"
-        --generate-c-code "${arg_NAME}"
-        ${PREFIX}
-        ${NAMESPACE}
-        "${arg_SERVICE_XML}"
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${arg_DEPENDS} "${arg_SERVICE_XML}"
-  )
-  set(${arg_OUTFILES} ${${arg_OUTFILES}} "${CMAKE_CURRENT_BINARY_DIR}/${arg_NAME}.c" PARENT_SCOPE)
-endfunction(add_gdbus_codegen)
diff --git a/liburl-dispatcher/CMakeLists.txt b/liburl-dispatcher/CMakeLists.txt
index 4c23c79..b30484f 100644
--- a/liburl-dispatcher/CMakeLists.txt
+++ b/liburl-dispatcher/CMakeLists.txt
@@ -6,34 +6,6 @@
 set(API_VERSION 1)
 set(ABI_VERSION 1)
 
-###########################
-# Generated Lib
-###########################
-
-set(GENERATED_HEADERS
-service-iface.h
-)
-
-set(GENERATED_SOURCES
-service-iface.c
-)
-
-add_gdbus_codegen(
-OUTFILES GENERATED_SOURCES
-NAME service-iface
-PREFIX com.canonical.URLDispatcher.
-NAMESPACE ServiceIface
-SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/com.canonical.URLDispatcher.xml
-)
-
-add_library(generated STATIC ${GENERATED_SOURCES})
-
-target_link_libraries(generated
-${GLIB2_LIBRARIES}
-${GOBJECT2_LIBRARIES}
-${GIO2_LIBRARIES}
-)
-
 ###########################
 # Lib
 ###########################
@@ -58,7 +30,7 @@ set_target_properties(dispatcher PROPERTIES
 )
 
 target_link_libraries(dispatcher
-generated
+service-generated
 ${GLIB2_LIBRARIES}
 ${GOBJECT2_LIBRARIES}
 -Wl,--no-undefined
diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt
index 1f7d193..80ded3d 100644
--- a/service/CMakeLists.txt
+++ b/service/CMakeLists.txt
@@ -8,29 +8,20 @@ add_definitions( -DOVERLAY_SYSTEM_DIRECTORY="${CMAKE_INSTALL_FULL_DATADIR}/url-d
 # Generated Lib
 ###########################
 
-
-set(SERVICE_GENERATED_HEADERS
-service-iface.h
-)
-
-set(SERVICE_GENERATED_SOURCES
-service-iface.c
-)
-
 add_gdbus_codegen(
-OUTFILES SERVICE_GENERATED_SOURCES
-NAME service-iface
-PREFIX com.canonical.URLDispatcher.
-NAMESPACE ServiceIface
-SERVICE_XML ${CMAKE_CURRENT_SOURCE_DIR}/../data/com.canonical.URLDispatcher.xml
+  SERVICE_GENERATED
+  service-iface
+  com.canonical.URLDispatcher.
+  ${CMAKE_SOURCE_DIR}/data/com.canonical.URLDispatcher.xml
+  NAMESPACE ServiceIface
 )
 
 add_library(service-generated STATIC ${SERVICE_GENERATED_SOURCES})
 
 target_link_libraries(service-generated
-${GLIB2_LIBRARIES}
-${GOBJECT2_LIBRARIES}
-${GIO2_LIBRARIES}
+  ${GLIB2_LIBRARIES}
+  ${GOBJECT2_LIBRARIES}
+  ${GIO2_LIBRARIES}
 )
 
 ###########################