Index: tapioca/Makefile.am
===================================================================
--- tapioca/Makefile.am	(revision 1595)
+++ tapioca/Makefile.am	(working copy)
@@ -8,42 +8,42 @@
 TARGET = $(ASSEMBLY)
 
 UTIL_SOURCES = \
-	Util/ConfigFileReader.cs \
-	Util/ManagerFileReader.cs
+	$(srcdir)/Util/ConfigFileReader.cs \
+	$(srcdir)/Util/ManagerFileReader.cs
 
 SOURCES = \
-	Avatar.cs \
-	Channel.cs \
-	ChannelTarget.cs \
-	ConnectionGroup.cs \
-	ConnectionManager.cs \
-	ConnectionManagerFactory.cs \
-	ConnectionManagerParameter.cs \
-	ContactBase.cs \
-	Connection.cs \
-	Contact.cs \
-	ContactListControl.cs \
-	ContactList.cs \
-	ContactGroup.cs \
-	ConfigureDefines.cs \
-	DBusProxyObject.cs \
-	Enum.cs \
-	Handle.cs \
-	PrivContactList.cs \
-	StreamAudio.cs \
-	StreamChannel.cs \
-	StreamObject.cs \
-	StreamVideo.cs \			
-	TextChannel.cs \
-	TextChannelMessage.cs \
-	UserContact.cs
+	$(srcdir)/Avatar.cs \
+	$(srcdir)/Channel.cs \
+	$(srcdir)/ChannelTarget.cs \
+	$(srcdir)/ConnectionGroup.cs \
+	$(srcdir)/ConnectionManager.cs \
+	$(srcdir)/ConnectionManagerFactory.cs \
+	$(srcdir)/ConnectionManagerParameter.cs \
+	$(srcdir)/ContactBase.cs \
+	$(srcdir)/Connection.cs \
+	$(srcdir)/Contact.cs \
+	$(srcdir)/ContactListControl.cs \
+	$(srcdir)/ContactList.cs \
+	$(srcdir)/ContactGroup.cs \
+	$(srcdir)/ConfigureDefines.cs \
+	$(srcdir)/DBusProxyObject.cs \
+	$(srcdir)/Enum.cs \
+	$(srcdir)/Handle.cs \
+	$(srcdir)/PrivContactList.cs \
+	$(srcdir)/StreamAudio.cs \
+	$(srcdir)/StreamChannel.cs \
+	$(srcdir)/StreamObject.cs \
+	$(srcdir)/StreamVideo.cs \			
+	$(srcdir)/TextChannel.cs \
+	$(srcdir)/TextChannelMessage.cs \
+	$(srcdir)/UserContact.cs
 
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEMBLY).config
 
 PKG_REFERENCES = \
 	$(TELEPATHY_SHARP_LIBS) \
 	$(GTK_SHARP_LIBS) \
-	-r:$(top_srcdir)/dbus-sharp-glib/NDesk.DBus.GLib.dll
+	$(NDESK_DBUS_GLIB_LIBS)
 
 
 $(ASSEMBLY): $(SOURCES) $(UTIL_SOURCES)
@@ -51,3 +51,6 @@
 
 all: $(ASSEMBLY)
 
+EXTRA_DIST = \
+	$(SOURCES) \
+	$(UTIL_SOURCES)
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 1595)
+++ tests/Makefile.am	(working copy)
@@ -8,16 +8,16 @@
 TARGET=$(ASSEMBLY)
 
 ASSEMBLY_SOURCES=\
-	ITest.cs \
-	ConnectionTest.cs \
-	ConnectionManagerTest.cs \
-	Main.cs
+	$(srcdir)/ITest.cs \
+	$(srcdir)/ConnectionTest.cs \
+	$(srcdir)/ConnectionManagerTest.cs \
+	$(srcdir)/Main.cs
 
 CLEANFILES = *.exe*
 
 PKG_REFERENCES = \
 	-r:../tapioca/INdT.Tapioca.dll \
-	-r:../dbus-sharp-glib/NDesk.DBus.GLib.dll \
+	$(NDESK_DBUS_GLIB_LIBS) \
 	$(GTK_SHARP_LIBS) \
 	$(TELEPATHY_SHARP_LIBS)
 
@@ -27,3 +27,5 @@
 	$(MCS) $(MCS_FLAGS) $(PKG_REFERENCES) $(ASSEMBLY_SOURCES) \
 	-target:exe -out:"$@"
 
+EXTRA_DIST = \
+	$(ASSEMBLY_SOURCES)
Index: configure.ac
===================================================================
--- configure.ac	(revision 1595)
+++ configure.ac	(working copy)
@@ -45,10 +45,15 @@
 AC_SUBST(LIB_SUFFIX)
 
 dnl Find Gtk#
-PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.10.0)
+PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= 2.8.0)
 AC_SUBST(GTK_SHARP_CFLAGS)
 AC_SUBST(GTK_SHARP_LIBS)
 
+dnl Find NDesk DBus (Managed DBus)
+PKG_CHECK_MODULES(NDESK_DBUS_GLIB, ndesk-dbus-glib-1.0)
+AC_SUBST(NDESK_DBUS_GLIB_CFLAGS)
+AC_SUBST(NDESK_DBUS_GLIB_LIBS)
+
 dnl Find Telepathy#
 PKG_CHECK_MODULES(TELEPATHY_SHARP, telepathy-sharp)
 AC_SUBST(TELEPATHY_SHARP_LIBS)
@@ -57,7 +62,6 @@
 Makefile
 tapioca-sharp.pc
 INdT.Tapioca.dll.config
-dbus-sharp-glib/Makefile
 tapioca/AssemblyInfo.cs
 tapioca/ConfigureDefines.cs
 tapioca/Makefile
Index: Makefile.am
===================================================================
--- Makefile.am	(revision 1595)
+++ Makefile.am	(working copy)
@@ -1,10 +1,9 @@
-SUBDIRS = dbus-sharp-glib tapioca tests
+SUBDIRS = tapioca tests
 
 EXTRA_DIST = 			\
 	ChangeLog
 	
 DIST_SUBDIRS = 			\
-	dbus-sharp-glib 	\
 	tapioca 			\
 	tests