diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 12d150d7..08b5e746 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,12 +30,17 @@ configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsol
     # qdbuscpp2xml -m  Session.h -o org.kde.konsole.Session.xml
     # qdbuscpp2xml -M -s ViewManager.h -o org.kde.konsole.Konsole.xml
 
+    # Generate dbus .xml files; do not store .xml in source folder
+    qt4_generate_dbus_interface( Session.h org.kde.konsole.Session.xml OPTIONS
+ -m)
+    qt4_generate_dbus_interface( ViewManager.h org.kde.konsole.Konsole.xml OPTIONS -s -M)
+
     qt4_add_dbus_adaptor( sessionadaptors_SRCS
-                          org.kde.konsole.Session.xml
+                          ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
                           Session.h
                           Konsole::Session )
     qt4_add_dbus_adaptor( konsoleadaptors_SRCS 
-                          org.kde.konsole.Konsole.xml 
+                          ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml 
                           ViewManager.h 
                           Konsole::ViewManager )
 
@@ -81,6 +86,8 @@ configure_file (config-konsole.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-konsol
         XKB.cpp
         ZModemDialog.cpp
         konsole_wcwidth.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Konsole.xml
+        ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml
     )
 
     set(konsole_LIBS
diff --git a/src/Session.h b/src/Session.h
index bcbd1c25..fc12842b 100644
--- a/src/Session.h
+++ b/src/Session.h
@@ -62,6 +62,7 @@ class ZModemDialog;
 class KONSOLEPRIVATE_EXPORT Session : public QObject
 {
 Q_OBJECT
+Q_CLASSINFO("D-Bus Interface", "org.kde.konsole.Session")
 
 public:
   Q_PROPERTY(QString name READ nameTitle)
diff --git a/src/org.kde.konsole.Konsole.xml b/src/org.kde.konsole.Konsole.xml
deleted file mode 100644
index 938e19e7..00000000
--- a/src/org.kde.konsole.Konsole.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.kde.konsole.Konsole">
-        <method name="sessionCount">
-            <arg type="i" direction="out"/>
-        </method>
-        <method name="currentSession">
-            <arg type="i" direction="out"/>
-        </method>
-        <method name="newSession">
-            <arg type="i" direction="out"/>
-            <arg name="profile" type="s" direction="in"/>
-            <arg name="directory" type="s" direction="in"/>
-        </method>
-        <method name="profileList">
-            <arg type="as" direction="out"/>
-        </method>
-        <method name="newSession">
-            <arg type="i" direction="out"/>
-        </method>
-        <method name="nextSession">
-        </method>
-        <method name="prevSession">
-        </method>
-        <method name="moveSessionLeft">
-        </method>
-        <method name="moveSessionRight">
-        </method>
-
-
-    </interface>
-</node>
diff --git a/src/org.kde.konsole.KonsoleScripting.xml b/src/org.kde.konsole.KonsoleScripting.xml
deleted file mode 100644
index d66890f8..00000000
--- a/src/org.kde.konsole.KonsoleScripting.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.konsole.KonsoleScripting">
-  </interface>
-</node>
diff --git a/src/org.kde.konsole.Session.xml b/src/org.kde.konsole.Session.xml
deleted file mode 100644
index f1ed7f2f..00000000
--- a/src/org.kde.konsole.Session.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-    <interface name="org.kde.konsole.Session">
-        <method name="environment">
-            <arg type="as" direction="out"/>
-        </method>
-        <method name="setEnvironment">
-            <arg name="environment" type="as" direction="in"/>
-        </method>
-        <method name="close">
-        </method>
-        <method name="setMonitorActivity">
-            <arg type="b" direction="in"/>
-        </method>
-        <method name="isMonitorActivity">
-            <arg type="b" direction="out"/>
-        </method>
-        <method name="setMonitorSilence">
-            <arg type="b" direction="in"/>
-        </method>
-        <method name="isMonitorSilence">
-            <arg type="b" direction="out"/>
-        </method>
-        <method name="setMonitorSilenceSeconds">
-            <arg name="seconds" type="i" direction="in"/>
-        </method>
-        <method name="setFlowControlEnabled">
-            <arg name="enabled" type="b" direction="in"/>
-        </method>
-        <method name="flowControlEnabled">
-            <arg type="b" direction="out"/>
-        </method>
-        <method name="sendText">
-            <arg name="text" type="s" direction="in"/>
-        </method>
-        <method name="sendMouseEvent">
-            <arg name="buttons" type="i" direction="in"/>
-            <arg name="column" type="i" direction="in"/>
-            <arg name="line" type="i" direction="in"/>
-            <arg name="eventType" type="i" direction="in"/>
-        </method>
-        <method name="processId">
-            <arg type="i" direction="out"/>
-        </method>
-        <method name="foregroundProcessId">
-            <arg type="i" direction="out"/>
-        </method>
-        <method name="setCodec">
-            <arg type="b" direction="out"/>
-            <arg name="codec" type="ay" direction="in"/>
-        </method>
-        <method name="codec">
-            <arg type="ay" direction="out"/>
-        </method>
-        <method name="setTitle">
-            <arg name="role" type="i" direction="in"/>
-            <arg name="title" type="s" direction="in"/>
-        </method>
-        <method name="title">
-            <arg type="s" direction="out"/>
-            <arg name="role" type="i" direction="in"/>
-        </method>
-    </interface>
-</node>
diff --git a/src/org.kde.konsole.SessionScripting.xml b/src/org.kde.konsole.SessionScripting.xml
deleted file mode 100644
index 1b7c73e7..00000000
--- a/src/org.kde.konsole.SessionScripting.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node>
-  <interface name="org.kde.konsole.SessionScripting">
-  </interface>
-</node>