diff --git a/DiagnoseTool/Makefile.am b/DiagnoseTool/Makefile.am
index aa51c1e10..f0f8bc338 100644
--- a/DiagnoseTool/Makefile.am
+++ b/DiagnoseTool/Makefile.am
@@ -3,7 +3,7 @@ TARGET = exe
 
 ASSEMBLY_INFO_SOURCE = Properties/AssemblyInfo.cs
 
-LIBS = $(REF_CMISSYNC) $(LOG4NET_LIBS) $(DBREEZE_LIBS) $(DOTCMIS_LIBS)
+LIBS = $(REF_CMISSYNC) $(LOG4NET_LIBS) $(DBREEZE_LIBS) $(DOTCMIS_LIBS) $(DATASPACE_LIBS)
 
 SOURCES =  \
 	Program.cs
diff --git a/Makefile.am b/Makefile.am
index 31ee8f643..a853964bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,7 @@ install-exec-local:
 	$(INSTALL) -m 0755 $(DBREEZE_PATH) $(DESTDIR)$(pkglibdir)
 	$(INSTALL) -m 0755 $(LOG4NET_PATH) $(DESTDIR)$(pkglibdir)
 	$(INSTALL) -m 0755 $(DOTCMIS_PATH) $(DESTDIR)$(pkglibdir)
+	$(INSTALL) -m 0755 $(DATASPACE_PATH) $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
 	$(RM) \
@@ -50,7 +51,8 @@ uninstall-local:
 		$(DESTDIR)$(pkglibdir)/$(notdir $(MOQ_PATH)) \
 		$(DESTDIR)$(pkglibdir)/$(notdir $(DBREEZE_PATH)) \
 		$(DESTDIR)$(pkglibdir)/$(notdir $(LOG4NET_PATH)) \
-		$(DESTDIR)$(pkglibdir)/$(notdir $(DOTCMIS_PATH))
+		$(DESTDIR)$(pkglibdir)/$(notdir $(DOTCMIS_PATH)) \
+		$(DESTDIR)$(pkglibdir)/$(notdir $(DATASPACE_PATH))
 
 # make it a .PHONY target, so it's always executed
 .PHONY: tmpinst
diff --git a/Makefile.fatbuild b/Makefile.fatbuild
index 0f3128929..6fbdaee2f 100644
--- a/Makefile.fatbuild
+++ b/Makefile.fatbuild
@@ -54,7 +54,7 @@ SHARPDLLS=4.5/Mono.Posix.dll atk-sharp.dll gdk-sharp.dll glib-sharp.dll gtk-shar
 # We will then explicitly name then when calling mkbundle with our program DLLs
 
 I18NDLLS=I18N.Rare.dll I18N.Other.dll I18N.MidEast.dll I18N.dll I18N.West.dll I18N.CJK.dll
-FATDLLS=CmisSync.Lib.dll DotCMIS.dll DBreeze.dll DotCMIS.dll log4net.dll Newtonsoft.Json.dll $(I18NDLLS) $(addprefix ./$(INCLIBDIR)/, $(notdir $(SHARPDLLS))) 
+FATDLLS=CmisSync.Lib.dll DotCMIS.dll DBreeze.dll DataSpace.dll log4net.dll Newtonsoft.Json.dll $(I18NDLLS) $(addprefix ./$(INCLIBDIR)/, $(notdir $(SHARPDLLS))) 
 
 # - But how do we find the DLLs, configs and gluelibs on our system?
 # Because they are on different locations on each system, this isn't easy.