diff --git a/src/Makefile.am b/src/Makefile.am
index f08b8f687dcdada08d165494407fe412ae80cdc4..08d58c35f95de2974da7680acfba9d6dde9f9bf3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ IAXSOURCES =
 IAXHEADERS =
 endif
 
-SUBDIRS = audio config gui $(ZEROCONFDIR)
+SUBDIRS = audio config gui dbus $(ZEROCONFDIR)
 
 sflphoned_SOURCES = eventthread.cpp 	main.cpp 	voIPLink.cpp \
 		managerimpl.cpp	observer.cpp \
diff --git a/src/dbus/Makefile.am b/src/dbus/Makefile.am
index 7af659bdc52fb392b28c664ca371faa423b791e5..2339a1ce9c5276757d8d1dd6a320f6ea58cc0f1c 100644
--- a/src/dbus/Makefile.am
+++ b/src/dbus/Makefile.am
@@ -4,13 +4,15 @@ EXTRA_DIST = *.xml README
 
 noinst_LTLIBRARIES = libdbus.la
 
-libdbus_la_SOURCES = \
-	callmanager-glue.h \
-	configurationmanager-glue.h \ 
-	callmanager.h callmanager.cpp \
-	dbusmanager.h dbusmanagerimpl.h dbusmanagerimp.cpp \
-	configurationmanager.h
+libdbus_la_SOURCES = callmanager.cpp \
+	 dbusmanagerimpl.cpp
 
-AM_CXXFLAGS =
+libdbus_la_CXXFLAGS = -DPREFIX=\"$(prefix)\" -DPROGSHAREDIR=\"${datadir}/sflphone\"
+libdbus_la_CPPFLAGS = -I$(top_srcdir)/libs -I$(top_srcdir)/src $(libccext2_CFLAGS) $(libdbuscpp_CFLAGS)
 libdbus_la_LIBADD = 
 
+noinst_HEADERS = \
+	callmanager-glue.h \
+	callmanager.h  \
+	dbusmanager.h \
+	dbusmanagerimpl.h
diff --git a/src/dbus/callmanager.h b/src/dbus/callmanager.h
index 58a77778c85ed5cff67e80ead82eeb5977d9807c..a2389851d14751816da3a7ad72a1abefc01d7173 100644
--- a/src/dbus/callmanager.h
+++ b/src/dbus/callmanager.h
@@ -34,7 +34,6 @@ class CallManager
 public:
 
     CallManager(DBus::Connection& connection);
-    static int exec();
 
 
 public:
diff --git a/src/dbus/dbusmanagerimpl.cpp b/src/dbus/dbusmanagerimpl.cpp
index 6a46563540db5b4d3c433091bc3f16a0f8060e9d..935c1b84621ee40d1ae6fc7ecfe1e5dc08d17c2e 100644
--- a/src/dbus/dbusmanagerimpl.cpp
+++ b/src/dbus/dbusmanagerimpl.cpp
@@ -18,3 +18,16 @@
  */
  
 #include <dbusmanagerimpl.h>
+
+
+void 
+DBusManagerImpl::connect(){
+
+}
+
+int 
+DBusManagerImpl::exec(){
+ return 1;
+}
+        
+    
diff --git a/src/dbus/dbusmanagerimpl.h b/src/dbus/dbusmanagerimpl.h
index 42871b86a98c82e934f5a858776b65342848cf5b..0b9de0ef541ab905f6ee6a880f96794198cde98c 100644
--- a/src/dbus/dbusmanagerimpl.h
+++ b/src/dbus/dbusmanagerimpl.h
@@ -17,16 +17,18 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#ifndef DBUSMANAGERIMPL_H
-#define DBUSMANAGERIMPL_H
+#ifndef __DBUSMANAGERIMPL_H__
+#define __DBUSMANAGERIMPL_H__
 
-class DBusManager {
+#include "callmanager.h"
+
+class DBusManagerImpl {
     public:
         void connect();
         int exec();
         
     private:
         CallManager * _callManager;
-}
+};
 
 #endif
diff --git a/src/main.cpp b/src/main.cpp
index f23c6de06b853e44ac16d59985c89ab20c61fcbf..cd6fa35caa87244841ed97f1bed77ce0ccbbda6a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@
 #include "user_cfg.h"
 #include "gui/server/guiserver.h"
 #include "gui/guiframework.h"
+#include "dbus/dbusmanager.h"
 #include "manager.h"
 
 #include "audio/audiolayer.h"
@@ -73,10 +74,11 @@ main (int argc, char **argv) {
       exit_code = -1;
     }
     if (initOK) {
-      GUI = &(GUIServer::instance());
-      GUIServer::instance().setSessionPort(sessionPort);
-      Manager::instance().setGui(GUI);
-      exit_code = GUIServer::instance().exec();
+      //GUI = &(GUIServer::instance());
+      //GUIServer::instance().setSessionPort(sessionPort);
+      //Manager::instance().setGui(GUI);
+      exit_code = DBusManager::instance().toto();
+      
     }
   }