diff --git a/Makefile.am b/Makefile.am
index 20263993..8a112853 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-basedirs = build SparkleLib data po
+basedirs = build SparkleLib SparkleLib/Git data po
 
 SUBDIRS = $(basedirs) $(GUISUBDIRS)
 DIST_SUBDIRS = $(basedirs) SparkleShare
diff --git a/SparkleLib/Git/Makefile.am b/SparkleLib/Git/Makefile.am
new file mode 100755
index 00000000..5d516405
--- /dev/null
+++ b/SparkleLib/Git/Makefile.am
@@ -0,0 +1,22 @@
+ASSEMBLY = SparkleLib.Git
+TARGET = library
+
+LINK = -r:$(DIR_BIN)/SparkleLib.dll
+
+SOURCES =  \
+	SparkleGit.cs \
+	SparkleFetcherGit.cs \
+	SparkleRepoGit.cs
+
+
+install-data-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+	done;
+
+uninstall-hook:
+	for ASM in $(EXTRA_BUNDLE); do \
+		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+	done;
+
+include $(top_srcdir)/build/build.mk
diff --git a/SparkleLib/Git/SparkleFetcherGit.cs b/SparkleLib/Git/SparkleFetcherGit.cs
index 31e3b24d..2a7fb713 100755
--- a/SparkleLib/Git/SparkleFetcherGit.cs
+++ b/SparkleLib/Git/SparkleFetcherGit.cs
@@ -20,6 +20,7 @@ using System.IO;
 using System.Diagnostics;
 using System.Text.RegularExpressions;
 using System.Threading;
+using SparkleLib;
 
 namespace SparkleLib {
 
diff --git a/SparkleLib/Git/SparkleGit.cs b/SparkleLib/Git/SparkleGit.cs
index 83e3460f..462c66fa 100644
--- a/SparkleLib/Git/SparkleGit.cs
+++ b/SparkleLib/Git/SparkleGit.cs
@@ -18,6 +18,7 @@
 using System;
 using System.IO;
 using System.Diagnostics;
+using SparkleLib;
 
 namespace SparkleLib {
 
diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index 471d33b3..e3eda157 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -19,6 +19,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
+using SparkleLib;
 
 namespace SparkleLib {
 
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index ddd7498c..68ab3755 100755
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -3,9 +3,6 @@ TARGET = library
 
 SOURCES =  \
 	Defines.cs \
-	Git/SparkleFetcherGit.cs \
-	Git/SparkleGit.cs \
-	Git/SparkleRepoGit.cs \
 	SparkleAnnouncement.cs \
 	SparkleBackend.cs \
 	SparkleChangeSet.cs \
diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index b06a8dc8..feaf4a83 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -614,7 +614,7 @@ namespace SparkleShare {
 
             try {
                 repo = (SparkleRepoBase) Activator.CreateInstance (
-                    Type.GetType ("SparkleLib.SparkleRepo" + backend + ", SparkleLib"),
+                    Type.GetType ("SparkleLib.SparkleRepo" + backend + ", SparkleLib." + backend),
                         folder_path
                 );
 
@@ -1015,7 +1015,7 @@ namespace SparkleShare {
 
             try {
                 this.fetcher = (SparkleFetcherBase) Activator.CreateInstance (
-                        Type.GetType ("SparkleLib.SparkleFetcher" + backend + ", SparkleLib"),
+                        Type.GetType ("SparkleLib.SparkleFetcher" + backend + ", SparkleLib." + backend),
                             server,
                             remote_folder,
                             tmp_folder
diff --git a/configure.ac b/configure.ac
index 0d4adcd5..538babad 100755
--- a/configure.ac
+++ b/configure.ac
@@ -157,6 +157,7 @@ data/plugins/Makefile
 SparkleLib/AssemblyInfo.cs
 SparkleLib/Defines.cs
 SparkleLib/Makefile
+SparkleLib/Git/Makefile
 SparkleShare/sparkleshare
 SparkleShare/Makefile
 SparkleShare/Mac/Makefile