diff --git a/Makefile.am b/Makefile.am
index 68b0b32e..e81e4787 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,19 +9,6 @@ SUBDIRS =	\
 	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
-
 EXTRA_DIST = gnome-doc-utils.make
 
 DISTCLEANFILES = \
@@ -30,3 +17,7 @@ DISTCLEANFILES = \
 	intltool-update		\
 	gnome-doc-utils.make
 
+clean-local: clean-gitsharp
+	rm -rf $(top_builddir)/bin
+
+include $(top_srcdir)/build/gitsharp.mk
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index 901d8377..c295ec8f 100644
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -16,16 +16,17 @@ SOURCES =  \
 	SparkleRepo.cs
 
 SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
+GITSHARP_FILES_EXPANDED = $(foreach file, $(GITSHARP_FILES), $(top_builddir)/$(file))
 
-EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED)
+EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED) $(GITSHARP_FILES_EXPANDED)
 
 install-data-hook:
-	for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
+	for ASM in $(EXTRA_BUNDLE); do \
 		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
 	done;
 
 uninstall-hook:
-	for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
+	for ASM in $(EXTRA_BUNDLE); do \
 		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
 	done;
 
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 0845e111..7908bc95 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))
+LINK_GITSHARP = $(foreach asm, $(GITSHARP_ASSEMBLIES), -r:$(top_builddir)/$(asm))
 
 REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
 LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
diff --git a/build/gitsharp.mk b/build/gitsharp.mk
new file mode 100644
index 00000000..774c18ea
--- /dev/null
+++ b/build/gitsharp.mk
@@ -0,0 +1,507 @@
+ASSEMBLY = GitSharp.dll
+ASSEMBLY_FILE = $(top_builddir)/GitSharp/bin/$(ASSEMBLY)
+
+# The list of source file is build by running the following command in GitSharp/
+#   find GitSharp.Core/ GitSharp/ -name *.cs -printf "\n\t%p \\" | sort
+SOURCES = \
+	GitSharp/AbstractObject.cs \
+	GitSharp/AbstractTreeNode.cs \
+	GitSharp/Author.cs \
+	GitSharp/Blob.cs \
+	GitSharp/Branch.cs \
+	GitSharp/Change.cs \
+	GitSharp/Commands/AbstractCommand.cs \
+	GitSharp/Commands/AbstractFetchCommand.cs \
+	GitSharp/Commands/CloneCommand.cs \
+	GitSharp/Commands/FetchCommand.cs \
+	GitSharp/Commands/IGitCommand.cs \
+	GitSharp/Commands/InitCommand.cs \
+	GitSharp/Commands/LogCommand.cs \
+	GitSharp/Commands/MergeCommand.cs \
+	GitSharp/Commands/PushCommand.cs \
+	GitSharp/Commands/StatusCommand.cs \
+	GitSharp/Commit.cs \
+	GitSharp/Config.cs \
+	GitSharp.Core/AbbreviatedObjectId.cs \
+	GitSharp.Core/AbstractIndexTreeVisitor.cs \
+	GitSharp.Core/AlternateRepositoryDatabase.cs \
+	GitSharp.Core/AnyObjectId.cs \
+	GitSharp.Core/BinaryDelta.cs \
+	GitSharp.Core/BlobBasedConfig.cs \
+	GitSharp.Core/ByteArrayExtensions.cs \
+	GitSharp.Core/ByteArrayWindow.cs \
+	GitSharp.Core/ByteBufferWindow.cs \
+	GitSharp.Core/ByteWindow.cs \
+	GitSharp.Core/CachedObjectDatabase.cs \
+	GitSharp.Core/CachedObjectDirectory.cs \
+	GitSharp.Core/Codec.cs \
+	GitSharp.Core/Commit.cs \
+	GitSharp.Core/CompleteAttribute.cs \
+	GitSharp.Core/Config.cs \
+	GitSharp.Core/ConsoleUserInfoProvider.cs \
+	GitSharp.Core/Constants.cs \
+	GitSharp.Core/CoreConfig.cs \
+	GitSharp.Core/DeltaOfsPackedObjectLoader.cs \
+	GitSharp.Core/DeltaPackedObjectLoader.cs \
+	GitSharp.Core/DeltaRefPackedObjectLoader.cs \
+	GitSharp.Core/Diff/DiffFormatter.cs \
+	GitSharp.Core/Diff/Edit.cs \
+	GitSharp.Core/Diff/EditList.cs \
+	GitSharp.Core/Diff/MyersDiff.cs \
+	GitSharp.Core/Diff/RawText.cs \
+	GitSharp.Core/Diff/Sequence.cs \
+	GitSharp.Core/DirectoryCache/BaseDirCacheEditor.cs \
+	GitSharp.Core/DirectoryCache/DirCacheBuilder.cs \
+	GitSharp.Core/DirectoryCache/DirCacheBuildIterator.cs \
+	GitSharp.Core/DirectoryCache/DirCache.cs \
+	GitSharp.Core/DirectoryCache/DirCacheEditor.cs \
+	GitSharp.Core/DirectoryCache/DirCacheEntry.cs \
+	GitSharp.Core/DirectoryCache/DirCacheIterator.cs \
+	GitSharp.Core/DirectoryCache/DirCacheTree.cs \
+	GitSharp.Core/Ensure.cs \
+	GitSharp.Core/Exceptions/CancelledException.cs \
+	GitSharp.Core/Exceptions/CheckoutConflictException.cs \
+	GitSharp.Core/Exceptions/CompoundException.cs \
+	GitSharp.Core/Exceptions/ConfigInvalidException.cs \
+	GitSharp.Core/Exceptions/CorruptObjectException.cs \
+	GitSharp.Core/Exceptions/EntryExistsException.cs \
+	GitSharp.Core/Exceptions/ExceptionExtensions.cs \
+	GitSharp.Core/Exceptions/FileLockedException.cs \
+	GitSharp.Core/Exceptions/GitlinksNotSupportedException.cs \
+	GitSharp.Core/Exceptions/IncorrectObjectTypeException.cs \
+	GitSharp.Core/Exceptions/InvalidObjectIdException.cs \
+	GitSharp.Core/Exceptions/InvalidPackException.cs \
+	GitSharp.Core/Exceptions/InvalidPatternException.cs \
+	GitSharp.Core/Exceptions/MissingBundlePrerequisiteException.cs \
+	GitSharp.Core/Exceptions/MissingObjectException.cs \
+	GitSharp.Core/Exceptions/NoClosingBracketException.cs \
+	GitSharp.Core/Exceptions/NoRemoteRepositoryException.cs \
+	GitSharp.Core/Exceptions/ObjectWritingException.cs \
+	GitSharp.Core/Exceptions/PackMismatchException.cs \
+	GitSharp.Core/Exceptions/PackProtocolException.cs \
+	GitSharp.Core/Exceptions/RepositoryNotFoundException.cs \
+	GitSharp.Core/Exceptions/RevisionSyntaxException.cs \
+	GitSharp.Core/Exceptions/RevWalkException.cs \
+	GitSharp.Core/Exceptions/StopWalkException.cs \
+	GitSharp.Core/Exceptions/SymlinksNotSupportedException.cs \
+	GitSharp.Core/Exceptions/TransportException.cs \
+	GitSharp.Core/Exceptions/UnmergedPathException.cs \
+	GitSharp.Core/FileBasedConfig.cs \
+	GitSharp.Core/FileMode.cs \
+	GitSharp.Core/FileTreeEntry.cs \
+	GitSharp.Core/FnMatch/AbstractHead.cs \
+	GitSharp.Core/FnMatch/CharacterHead.cs \
+	GitSharp.Core/FnMatch/FileNameMatcher.cs \
+	GitSharp.Core/FnMatch/GroupHead.cs \
+	GitSharp.Core/FnMatch/IHead.cs \
+	GitSharp.Core/FnMatch/LastHead.cs \
+	GitSharp.Core/FnMatch/RestrictedWildCardHead.cs \
+	GitSharp.Core/FnMatch/WildCardHead.cs \
+	GitSharp.Core/ForceModified.cs \
+	GitSharp.Core/GitException.cs \
+	GitSharp.Core/GitIndex.cs \
+	GitSharp.Core/GitlinkTreeEntry.cs \
+	GitSharp.Core/IgnoreHandler.cs \
+	GitSharp.Core/IndexChangedEventArgs.cs \
+	GitSharp.Core/IndexDiff.cs \
+	GitSharp.Core/IndexTreeVisitor.cs \
+	GitSharp.Core/IndexTreeWalker.cs \
+	GitSharp.Core/InflaterCache.cs \
+	GitSharp.Core/LockFile.cs \
+	GitSharp.Core/Merge/MergeAlgorithm.cs \
+	GitSharp.Core/Merge/MergeChunk.cs \
+	GitSharp.Core/Merge/MergeFormatter.cs \
+	GitSharp.Core/Merge/Merger.cs \
+	GitSharp.Core/Merge/MergeResult.cs \
+	GitSharp.Core/Merge/MergeStrategy.cs \
+	GitSharp.Core/Merge/StrategyOneSided.cs \
+	GitSharp.Core/Merge/StrategySimpleTwoWayInCore.cs \
+	GitSharp.Core/Merge/ThreeWayMerger.cs \
+	GitSharp.Core/Merge/ThreeWayMergeStrategy.cs \
+	GitSharp.Core/MutableObjectId.cs \
+	GitSharp.Core/NullProgressMonitor.cs \
+	GitSharp.Core/ObjectChecker.cs \
+	GitSharp.Core/ObjectDatabase.cs \
+	GitSharp.Core/ObjectDirectory.cs \
+	GitSharp.Core/ObjectId.cs \
+	GitSharp.Core/ObjectIdRef.cs \
+	GitSharp.Core/ObjectIdSubclassMap.cs \
+	GitSharp.Core/ObjectLoader.cs \
+	GitSharp.Core/ObjectType.cs \
+	GitSharp.Core/ObjectWriter.cs \
+	GitSharp.Core/OffsetCache.cs \
+	GitSharp.Core/PackedObjectLoader.cs \
+	GitSharp.Core/PackFile.cs \
+	GitSharp.Core/PackIndex.cs \
+	GitSharp.Core/PackIndexV1.cs \
+	GitSharp.Core/PackIndexV2.cs \
+	GitSharp.Core/PackIndexWriter.cs \
+	GitSharp.Core/PackIndexWriterV1.cs \
+	GitSharp.Core/PackIndexWriterV2.cs \
+	GitSharp.Core/PackLock.cs \
+	GitSharp.Core/PackOutputStream.cs \
+	GitSharp.Core/PackReverseIndex.cs \
+	GitSharp.Core/PackWriter.cs \
+	GitSharp.Core/Patch/BinaryHunk.cs \
+	GitSharp.Core/Patch/CombinedFileHeader.cs \
+	GitSharp.Core/Patch/CombinedHunkHeader.cs \
+	GitSharp.Core/Patch/FileHeader.cs \
+	GitSharp.Core/Patch/FormatError.cs \
+	GitSharp.Core/Patch/HunkHeader.cs \
+	GitSharp.Core/Patch/Patch.cs \
+	GitSharp.Core/PersonIdent.cs \
+	GitSharp.Core/Platform/Linux.cs \
+	GitSharp.Core/Platform/Mac.cs \
+	GitSharp.Core/Platform/Platform.cs \
+	GitSharp.Core/Platform/Windows.cs \
+	GitSharp.Core/ProgressMonitor.cs \
+	GitSharp.Core/Properties/AssemblyInfo.cs \
+	GitSharp.Core/RefComparator.cs \
+	GitSharp.Core/Ref.cs \
+	GitSharp.Core/RefDatabase.cs \
+	GitSharp.Core/RefDirectory.cs \
+	GitSharp.Core/RefDirectoryRename.cs \
+	GitSharp.Core/RefDirectoryUpdate.cs \
+	GitSharp.Core/ReflogReader.cs \
+	GitSharp.Core/RefRename.cs \
+	GitSharp.Core/RefsChangedEventArgs.cs \
+	GitSharp.Core/RefUpdate.cs \
+	GitSharp.Core/RefWriter.cs \
+	GitSharp.Core/RepositoryCache.cs \
+	GitSharp.Core/RepositoryChangedEventArgs.cs \
+	GitSharp.Core/RepositoryConfig.cs \
+	GitSharp.Core/Repository.cs \
+	GitSharp.Core/RepositoryListener.cs \
+	GitSharp.Core/RepositoryState.cs \
+	GitSharp.Core/RevPlot/AbstractPlotRenderer.cs \
+	GitSharp.Core/RevPlot/PlotCommit.cs \
+	GitSharp.Core/RevPlot/PlotCommitList.cs \
+	GitSharp.Core/RevPlot/PlotLane.cs \
+	GitSharp.Core/RevPlot/PlotWalk.cs \
+	GitSharp.Core/RevWalk/AbstractRevQueue.cs \
+	GitSharp.Core/RevWalk/BlockObjQueue.cs \
+	GitSharp.Core/RevWalk/BlockRevQueue.cs \
+	GitSharp.Core/RevWalk/BoundaryGenerator.cs \
+	GitSharp.Core/RevWalk/DateRevQueue.cs \
+	GitSharp.Core/RevWalk/DelayRevQueue.cs \
+	GitSharp.Core/RevWalk/EndGenerator.cs \
+	GitSharp.Core/RevWalk/FIFORevQueue.cs \
+	GitSharp.Core/RevWalk/Filter/AndRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/AuthorRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/CommitterRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/CommitTimeRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/MessageRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/NotRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/OrRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/PatternMatchRevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/RevFilter.cs \
+	GitSharp.Core/RevWalk/Filter/RevFlagFilter.cs \
+	GitSharp.Core/RevWalk/Filter/SubStringRevFilter.cs \
+	GitSharp.Core/RevWalk/FixUninterestingGenerator.cs \
+	GitSharp.Core/RevWalk/FooterKey.cs \
+	GitSharp.Core/RevWalk/FooterLine.cs \
+	GitSharp.Core/RevWalk/Generator.cs \
+	GitSharp.Core/RevWalk/LIFORevQueue.cs \
+	GitSharp.Core/RevWalk/MergeBaseGenerator.cs \
+	GitSharp.Core/RevWalk/ObjectWalk.cs \
+	GitSharp.Core/RevWalk/PendingGenerator.cs \
+	GitSharp.Core/RevWalk/RevBlob.cs \
+	GitSharp.Core/RevWalk/RevCommit.cs \
+	GitSharp.Core/RevWalk/RevCommitList.cs \
+	GitSharp.Core/RevWalk/RevFlag.cs \
+	GitSharp.Core/RevWalk/RevFlagSet.cs \
+	GitSharp.Core/RevWalk/RevObject.cs \
+	GitSharp.Core/RevWalk/RevObjectList.cs \
+	GitSharp.Core/RevWalk/RevSort.cs \
+	GitSharp.Core/RevWalk/RevTag.cs \
+	GitSharp.Core/RevWalk/RevTree.cs \
+	GitSharp.Core/RevWalk/RevWalk.cs \
+	GitSharp.Core/RevWalk/RewriteGenerator.cs \
+	GitSharp.Core/RevWalk/RewriteTreeFilter.cs \
+	GitSharp.Core/RevWalk/StartGenerator.cs \
+	GitSharp.Core/RevWalk/TopoSortGenerator.cs \
+	GitSharp.Core/SubmoduleConfig.cs \
+	GitSharp.Core/SymbolicRef.cs \
+	GitSharp.Core/SymlinkTreeEntry.cs \
+	GitSharp.Core/SystemReader.cs \
+	GitSharp.Core/Tag.cs \
+	GitSharp.Core/TextProgressMonitor.cs \
+	GitSharp.Core/TransferConfig.cs \
+	GitSharp.Core/Transport/BaseConnection.cs \
+	GitSharp.Core/Transport/BaseFetchConnection.cs \
+	GitSharp.Core/Transport/BasePackConnection.cs \
+	GitSharp.Core/Transport/BasePackFetchConnection.cs \
+	GitSharp.Core/Transport/BasePackPushConnection.cs \
+	GitSharp.Core/Transport/BundleFetchConnection.cs \
+	GitSharp.Core/Transport/BundleWriter.cs \
+	GitSharp.Core/Transport/DaemonClient.cs \
+	GitSharp.Core/Transport/Daemon.cs \
+	GitSharp.Core/Transport/DaemonService.cs \
+	GitSharp.Core/Transport/DefaultSshSessionFactory.cs \
+	GitSharp.Core/Transport/FetchHeadRecord.cs \
+	GitSharp.Core/Transport/FetchProcess.cs \
+	GitSharp.Core/Transport/FetchResult.cs \
+	GitSharp.Core/Transport/HttpTransport.cs \
+	GitSharp.Core/Transport/IConnection.cs \
+	GitSharp.Core/Transport/IFetchConnection.cs \
+	GitSharp.Core/Transport/IndexPack.cs \
+	GitSharp.Core/Transport/IPackTransport.cs \
+	GitSharp.Core/Transport/IPostReceiveHook.cs \
+	GitSharp.Core/Transport/IPreReceiveHook.cs \
+	GitSharp.Core/Transport/IPushConnection.cs \
+	GitSharp.Core/Transport/ITransportBundle.cs \
+	GitSharp.Core/Transport/IWalkTransport.cs \
+	GitSharp.Core/Transport/LongMap.cs \
+	GitSharp.Core/Transport/OpenSshConfig.cs \
+	GitSharp.Core/Transport/OperationResult.cs \
+	GitSharp.Core/Transport/PackedObjectInfo.cs \
+	GitSharp.Core/Transport/PacketLineIn.cs \
+	GitSharp.Core/Transport/PacketLineOut.cs \
+	GitSharp.Core/Transport/PushProcess.cs \
+	GitSharp.Core/Transport/PushResult.cs \
+	GitSharp.Core/Transport/ReceiveCommand.cs \
+	GitSharp.Core/Transport/ReceivePack.cs \
+	GitSharp.Core/Transport/RefAdvertiser.cs \
+	GitSharp.Core/Transport/RefFilter.cs \
+	GitSharp.Core/Transport/RefSpec.cs \
+	GitSharp.Core/Transport/RemoteConfig.cs \
+	GitSharp.Core/Transport/RemoteRefUpdate.cs \
+	GitSharp.Core/Transport/SideBandInputStream.cs \
+	GitSharp.Core/Transport/SideBandOutputStream.cs \
+	GitSharp.Core/Transport/SideBandProgressMonitor.cs \
+	GitSharp.Core/Transport/SshConfigSessionFactory.cs \
+	GitSharp.Core/Transport/SshSessionFactory.cs \
+	GitSharp.Core/Transport/SshTransport.cs \
+	GitSharp.Core/Transport/TagOpt.cs \
+	GitSharp.Core/Transport/TcpTransport.cs \
+	GitSharp.Core/Transport/TrackingRefUpdate.cs \
+	GitSharp.Core/Transport/TransportAmazonS3.cs \
+	GitSharp.Core/Transport/TransportBundleFile.cs \
+	GitSharp.Core/Transport/TransportBundleStream.cs \
+	GitSharp.Core/Transport/Transport.cs \
+	GitSharp.Core/Transport/TransportGitAnon.cs \
+	GitSharp.Core/Transport/TransportGitSsh.cs \
+	GitSharp.Core/Transport/TransportHttp.cs \
+	GitSharp.Core/Transport/TransportLocal.cs \
+	GitSharp.Core/Transport/TransportSftp.cs \
+	GitSharp.Core/Transport/UploadPack.cs \
+	GitSharp.Core/Transport/URIish.cs \
+	GitSharp.Core/Transport/WalkEncryption.cs \
+	GitSharp.Core/Transport/WalkFetchConnection.cs \
+	GitSharp.Core/Transport/WalkPushConnection.cs \
+	GitSharp.Core/Transport/WalkRemoteObjectDatabase.cs \
+	GitSharp.Core/Tree.cs \
+	GitSharp.Core/TreeEntry.cs \
+	GitSharp.Core/Treeish.cs \
+	GitSharp.Core/TreeIterator.cs \
+	GitSharp.Core/TreeVisitor.cs \
+	GitSharp.Core/TreeVisitorWithCurrentDirectory.cs \
+	GitSharp.Core/TreeWalk/AbstractTreeIterator.cs \
+	GitSharp.Core/TreeWalk/CanonicalTreeParser.cs \
+	GitSharp.Core/TreeWalk/EmptyTreeIterator.cs \
+	GitSharp.Core/TreeWalk/FileTreeIterator.cs \
+	GitSharp.Core/TreeWalk/Filter/AndTreeFilter.cs \
+	GitSharp.Core/TreeWalk/Filter/NotTreeFilter.cs \
+	GitSharp.Core/TreeWalk/Filter/OrTreeFilter.cs \
+	GitSharp.Core/TreeWalk/Filter/PathFilter.cs \
+	GitSharp.Core/TreeWalk/Filter/PathFilterGroup.cs \
+	GitSharp.Core/TreeWalk/Filter/PathSuffixFilter.cs \
+	GitSharp.Core/TreeWalk/Filter/TreeFilter.cs \
+	GitSharp.Core/TreeWalk/NameConflictTreeWalk.cs \
+	GitSharp.Core/TreeWalk/TreeWalk.cs \
+	GitSharp.Core/TreeWalk/WorkingTreeIterator.cs \
+	GitSharp.Core/UnpackedObjectCache.cs \
+	GitSharp.Core/UnpackedObjectLoader.cs \
+	GitSharp.Core/UserConfig.cs \
+	GitSharp.Core/UserInfoProvider.cs \
+	GitSharp.Core/Util/ArrayExtensions.cs \
+	GitSharp.Core/Util/AtomicReferenceArray.cs \
+	GitSharp.Core/Util/BigEndianBitConverter.cs \
+	GitSharp.Core/Util/CheckedOutputStream.cs \
+	GitSharp.Core/Util/CRC32.cs \
+	GitSharp.Core/Util/DateTimeExtensions.cs \
+	GitSharp.Core/Util/DigestOutputStream.cs \
+	GitSharp.Core/Util/EndianBinaryReader.cs \
+	GitSharp.Core/Util/EndianBinaryWriter.cs \
+	GitSharp.Core/Util/EndianBitConverter.cs \
+	GitSharp.Core/Util/Endianness.cs \
+	GitSharp.Core/Util/Extensions.cs \
+	GitSharp.Core/Util/FS.cs \
+	GitSharp.Core/Util/GenericComparer.cs \
+	GitSharp.Core/Util/Hex.cs \
+	GitSharp.Core/Util/ICharSequence.cs \
+	GitSharp.Core/Util/IListUtil.cs \
+	GitSharp.Core/Util/Inspect.cs \
+	GitSharp.Core/Util/Int32.cs \
+	GitSharp.Core/Util/IntList.cs \
+	GitSharp.Core/Util/IO.cs \
+	GitSharp.Core/Util/IO/InterruptTimer.cs \
+	GitSharp.Core/Util/IO/TimeoutStream.cs \
+	GitSharp.Core/Util/IO/UnionInputStream.cs \
+	GitSharp.Core/Util/JavaHelper/AtomicInteger.cs \
+	GitSharp.Core/Util/JavaHelper/AtomicReference.cs \
+	GitSharp.Core/Util/JavaHelper/AtomicValue.cs \
+	GitSharp.Core/Util/JavaHelper/Charset.cs \
+	GitSharp.Core/Util/JavaHelper/Properties.cs \
+	GitSharp.Core/Util/ListIterator.cs \
+	GitSharp.Core/Util/LittleEndianBitConverter.cs \
+	GitSharp.Core/Util/LongList.cs \
+	GitSharp.Core/Util/MessageDigest.cs \
+	GitSharp.Core/Util/MutableInteger.cs \
+	GitSharp.Core/Util/NB.cs \
+	GitSharp.Core/Util/NestedDictionary.cs \
+	GitSharp.Core/Util/PathUtil.cs \
+	GitSharp.Core/Util/PipeStream.cs \
+	GitSharp.Core/Util/QuotedString.cs \
+	GitSharp.Core/Util/RawCharSequence.cs \
+	GitSharp.Core/Util/RawParseUtils.cs \
+	GitSharp.Core/Util/RawSubstringPattern.cs \
+	GitSharp.Core/Util/RefList.cs \
+	GitSharp.Core/Util/RefMap.cs \
+	GitSharp.Core/Util/Stream.cs \
+	GitSharp.Core/Util/StringExtension.cs \
+	GitSharp.Core/Util/StringUtils.cs \
+	GitSharp.Core/Util/TemporaryBuffer.cs \
+	GitSharp.Core/Util/WeakReference.cs \
+	GitSharp.Core/WholePackedObjectLoader.cs \
+	GitSharp.Core/WindowCacheConfig.cs \
+	GitSharp.Core/WindowCache.cs \
+	GitSharp.Core/WindowCursor.cs \
+	GitSharp.Core/WorkDirCheckout.cs \
+	GitSharp.Core/WriteTree.cs \
+	GitSharp/Diff.cs \
+	GitSharp/Examples.cs \
+	GitSharp/Git.cs \
+	GitSharp/IgnoreRules.cs \
+	GitSharp/Index.cs \
+	GitSharp/IReferenceObject.cs \
+	GitSharp/Leaf.cs \
+	GitSharp/Properties/AssemblyInfo.cs \
+	GitSharp/Ref.cs \
+	GitSharp/Remote.cs \
+	GitSharp/Repository.cs \
+	GitSharp/RepositoryStatus.cs \
+	GitSharp/ResetBehavior.cs \
+	GitSharp/Stash.cs \
+	GitSharp/Stubs/AddCommand.cs \
+	GitSharp/Stubs/AmCommand.cs \
+	GitSharp/Stubs/AnnotateCommand.cs \
+	GitSharp/Stubs/ApplyCommand.cs \
+	GitSharp/Stubs/ArchiveCommand.cs \
+	GitSharp/Stubs/BlameCommand.cs \
+	GitSharp/Stubs/BranchCommand.cs \
+	GitSharp/Stubs/CatFileCommand.cs \
+	GitSharp/Stubs/CheckoutCommand.cs \
+	GitSharp/Stubs/CheckoutIndexCommand.cs \
+	GitSharp/Stubs/CherryCommand.cs \
+	GitSharp/Stubs/CherryPickCommand.cs \
+	GitSharp/Stubs/CleanCommand.cs \
+	GitSharp/Stubs/CommitCommand.cs \
+	GitSharp/Stubs/CommitTreeCommand.cs \
+	GitSharp/Stubs/ConfigCommand.cs \
+	GitSharp/Stubs/CountObjectsCommand.cs \
+	GitSharp/Stubs/DescribeCommand.cs \
+	GitSharp/Stubs/DiffCommand.cs \
+	GitSharp/Stubs/DiffFilesCommand.cs \
+	GitSharp/Stubs/DiffIndexCommand.cs \
+	GitSharp/Stubs/DifftoolCommand.cs \
+	GitSharp/Stubs/DiffTreeCommand.cs \
+	GitSharp/Stubs/FastExportCommand.cs \
+	GitSharp/Stubs/FastImportCommand.cs \
+	GitSharp/Stubs/FetchPackCommand.cs \
+	GitSharp/Stubs/FilterBranchCommand.cs \
+	GitSharp/Stubs/ForEachRefCommand.cs \
+	GitSharp/Stubs/FormatPatchCommand.cs \
+	GitSharp/Stubs/FsckCommand.cs \
+	GitSharp/Stubs/GcCommand.cs \
+	GitSharp/Stubs/GrepCommand.cs \
+	GitSharp/Stubs/HashObjectCommand.cs \
+	GitSharp/Stubs/IndexPackCommand.cs \
+	GitSharp/Stubs/LsFilesCommand.cs \
+	GitSharp/Stubs/LsRemoteCommand.cs \
+	GitSharp/Stubs/LsTreeCommand.cs \
+	GitSharp/Stubs/MailinfoCommand.cs \
+	GitSharp/Stubs/MailsplitCommand.cs \
+	GitSharp/Stubs/MergeBaseCommand.cs \
+	GitSharp/Stubs/MergeFileCommand.cs \
+	GitSharp/Stubs/MergeIndexCommand.cs \
+	GitSharp/Stubs/MergetoolCommand.cs \
+	GitSharp/Stubs/MktreeCommand.cs \
+	GitSharp/Stubs/MvCommand.cs \
+	GitSharp/Stubs/NameRevCommand.cs \
+	GitSharp/Stubs/NotesCommand.cs \
+	GitSharp/Stubs/PackObjectsCommand.cs \
+	GitSharp/Stubs/PackRedundantCommand.cs \
+	GitSharp/Stubs/PackRefsCommand.cs \
+	GitSharp/Stubs/PatchIdCommand.cs \
+	GitSharp/Stubs/PeekRemoteCommand.cs \
+	GitSharp/Stubs/PruneCommand.cs \
+	GitSharp/Stubs/PrunePackedCommand.cs \
+	GitSharp/Stubs/QuiltimportCommand.cs \
+	GitSharp/Stubs/ReadTreeCommand.cs \
+	GitSharp/Stubs/RebaseCommand.cs \
+	GitSharp/Stubs/ReceivePackCommand.cs \
+	GitSharp/Stubs/ReflogCommand.cs \
+	GitSharp/Stubs/RelinkCommand.cs \
+	GitSharp/Stubs/RemoteCommand.cs \
+	GitSharp/Stubs/RepackCommand.cs \
+	GitSharp/Stubs/ReplaceCommand.cs \
+	GitSharp/Stubs/RequestPullCommand.cs \
+	GitSharp/Stubs/ResetCommand.cs \
+	GitSharp/Stubs/RevertCommand.cs \
+	GitSharp/Stubs/RevParseCommand.cs \
+	GitSharp/Stubs/RmCommand.cs \
+	GitSharp/Stubs/SendPackCommand.cs \
+	GitSharp/Stubs/ShortlogCommand.cs \
+	GitSharp/Stubs/ShowBranchCommand.cs \
+	GitSharp/Stubs/ShowCommand.cs \
+	GitSharp/Stubs/ShowRefCommand.cs \
+	GitSharp/Stubs/StripspaceCommand.cs \
+	GitSharp/Stubs/SubmoduleCommand.cs \
+	GitSharp/Stubs/SvnCommand.cs \
+	GitSharp/Stubs/SymbolicRefCommand.cs \
+	GitSharp/Stubs/TagCommand.cs \
+	GitSharp/Stubs/TarTreeCommand.cs \
+	GitSharp/Stubs/UnpackFileCommand.cs \
+	GitSharp/Stubs/UnpackObjectsCommand.cs \
+	GitSharp/Stubs/UpdateIndexCommand.cs \
+	GitSharp/Stubs/UpdateServerInfoCommand.cs \
+	GitSharp/Stubs/UploadArchiveCommand.cs \
+	GitSharp/Stubs/UploadPackCommand.cs \
+	GitSharp/Stubs/VarCommand.cs \
+	GitSharp/Stubs/VerifyPackCommand.cs \
+	GitSharp/Stubs/VerifyTagCommand.cs \
+	GitSharp/Stubs/WhatchangedCommand.cs \
+	GitSharp/Tag.cs \
+	GitSharp/Text.cs \
+	GitSharp/Tree.cs \
+	GitSharp/UserInfoProvider.cs
+
+RESOURCES = \
+	GitSharp.build \
+	version.txt
+
+BUNDLE = \
+	DiffieHellman.dll \
+	ICSharpCode.SharpZipLib.dll \
+	Org.Mentalis.Security.dll \
+	Tamir.SharpSSH.dll
+
+GITSHARP_SRCDIR = $(top_srcdir)/GitSharp
+
+SOURCES_BUILD = $(addprefix $(GITSHARP_SRCDIR)/, $(SOURCES))
+
+RESOURCES_EXPANDED = $(addprefix $(GITSHARP_SRCDIR)/, $(RESOURCES))
+
+BUNDLE_EXPANDED = $(addprefix $(GITSHARP_SRCDIR)/lib/, $(BUNDLE))
+
+all-local: $(ASSEMBLY_FILE)
+
+$(ASSEMBLY_FILE): $(SOURCES_BUILD)
+	$(NANT) -buildfile:$(GITSHARP_SRCDIR)/GitSharp.build -D:path.build=$(abs_top_builddir)/GitSharp/bin -D:path.build.output=$(abs_top_builddir)/GitSharp/bin compile-gitsharp;
+
+clean-gitsharp:
+	rm -rf $(top_builddir)/GitSharp/bin
+
+EXTRA_DIST += $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(BUNDLE_EXPANDED)
+
diff --git a/build/m4/sparkleshare/gitsharp.m4 b/build/m4/sparkleshare/gitsharp.m4
index 3ac597c4..7a7bff13 100644
--- a/build/m4/sparkleshare/gitsharp.m4
+++ b/build/m4/sparkleshare/gitsharp.m4
@@ -1,17 +1,23 @@
 AC_DEFUN([SPARKLESHARE_GITSHARP],
 [
+	SHAMROCK_FIND_PROGRAM_OR_BAIL(NANT, nant)
+
 	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"
+	asms="GitSharp/bin/ICSharpCode.SharpZipLib.dll GitSharp/bin/Tamir.SharpSSH.dll GitSharp/bin/GitSharp.Core.dll GitSharp/bin/GitSharp.dll"
+	GITSHARP_ASSEMBLIES="$asms"
 	for asm in $asms; do
-		GITSHARP_ASSEMBLIES="$GITSHARP_ASSEMBLIES $asm"
-		[[ -r "$asm.mdb" ]] && GITSHARP_ASSEMBLIES="$GITSHARP_ASSEMBLIES $asm.mdb"
+		GITSHARP_FILES="$GITSHARP_FILES $asm"
+		[[ -r "$asm.mdb" ]] && GITSHARP_FILES="$GITSHARP_FILES $asm.mdb"
 	done
+	# Additional dependencies that we need to install
+	GITSHARP_FILES="$GITSHARP_FILES GitSharp/lib/DiffieHellman.dll GitSharp/lib/Org.Mentalis.Security.dll"
 
 	AC_SUBST([GITSHARP_ASSEMBLIES])
+	AC_SUBST([GITSHARP_FILES])
 ])