diff --git a/.gitmodules b/.gitmodules
index 2d9ee5ea..64b6fac6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "SmartIrc4net"]
 	path = SmartIrc4net
 	url = git://git.qnetp.net/smartirc4net.git
+[submodule "GitSharp"]
+	path = GitSharp
+	url = http://github.com/henon/GitSharp.git
diff --git a/GitSharp b/GitSharp
new file mode 160000
index 00000000..fed95355
--- /dev/null
+++ b/GitSharp
@@ -0,0 +1 @@
+Subproject commit fed9535519a1a918ed6734001b7f5c3a83dd8a10
diff --git a/GitSharp/TODO b/GitSharp/TODO
deleted file mode 100644
index 40705dbb..00000000
--- a/GitSharp/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Reminder to use Git# when a new release is coming out in August.
diff --git a/Makefile.am b/Makefile.am
index 125a6a9f..68b0b32e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,22 @@ SUBDIRS =	\
 	help	\
 	NotifySharp \
 	SmartIrc4net \
+	. \
 	SparkleLib \
 	SparkleShare \
 	data \
 	po
 
+ASSEMBLY = GitSharp.dll
+ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY)
+
+all-local: $(ASSEMBLY_FILE)
+
+$(ASSEMBLY_FILE):
+	@pushd GitSharp; \
+	$(MONO) tools/nant/NAnt.exe -buildfile:GitSharp.build -D:path.build.output=$(top_builddir)/../bin compile-gitsharp; \
+	popd;
+
 clean-local:
 	rm -rf $(top_builddir)/bin
 
diff --git a/build/build.environment.mk b/build/build.environment.mk
index a2ccc4a4..0845e111 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -16,7 +16,7 @@ LINK_GNOME = $(GNOME_SHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
 LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
 LINK_SMARTIRC4NET = -r:$(top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
-
+LINK_GITSHARP = $(foreach asm, $(GITSHARP_ASSEMBLIES), -r:$(DIR_BIN)/$(asm))
 
 REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
 LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
@@ -26,7 +26,7 @@ REF_FRIENDFACE = $(LINK_SYSTEM) $(LINK_GTK) $(LINK_MONO_POSIX)
 LINK_FRIENDFACE = -r:$(DIR_BIN)/FriendFace.dll
 LINK_FRIENDFACE_DEPS = $(REF_FRIENDFACE) $(LINK_FRIENDFACE)
 
-REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET)
+REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX) $(LINK_SMARTIRC4NET) $(LINK_GITSHARP)
 LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
 LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
 
diff --git a/build/m4/sparkleshare/gitsharp.m4 b/build/m4/sparkleshare/gitsharp.m4
new file mode 100644
index 00000000..3ac597c4
--- /dev/null
+++ b/build/m4/sparkleshare/gitsharp.m4
@@ -0,0 +1,17 @@
+AC_DEFUN([SPARKLESHARE_GITSHARP],
+[
+	if test ! -d "$srcdir/GitSharp"; then
+		AC_MSG_ERROR([GitSharp folder not found])
+	fi
+
+	dnl Assemblies for GitSharp and their dependencies
+	dnl GitSharp also brings in Winterdom.IO.FileMap.dll but it is not used
+	asms="ICSharpCode.SharpZipLib.dll Tamir.SharpSSH.dll GitSharp.Core.dll GitSharp.dll"
+	for asm in $asms; do
+		GITSHARP_ASSEMBLIES="$GITSHARP_ASSEMBLIES $asm"
+		[[ -r "$asm.mdb" ]] && GITSHARP_ASSEMBLIES="$GITSHARP_ASSEMBLIES $asm.mdb"
+	done
+
+	AC_SUBST([GITSHARP_ASSEMBLIES])
+])
+
diff --git a/configure.ac b/configure.ac
index f028df0b..59038b0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,7 @@ AC_SUBST(NDESK_DBUS_GLIB_LIBS)
 SPARKLESHARE_CHECK_GTK_SHARP
 #SPARKLESHARE_CHECK_NOTIFY_SHARP
 SPARKLESHARE_SMARTIRC4NET
+SPARKLESHARE_GITSHARP
 
 SHAMROCK_CHECK_NUNIT