diff --git a/FriendFace/Makefile.am b/FriendFace/Makefile.am
new file mode 100644
index 00000000..262bf4ce
--- /dev/null
+++ b/FriendFace/Makefile.am
@@ -0,0 +1,11 @@
+ASSEMBLY = FriendFace
+TARGET = library
+
+LINK = $(REF_FRIENDFACE)
+
+SOURCES =  \
+	FriendFace.cs \
+	GravatarIconProvider.cs \
+	IconProvider.cs
+
+include $(top_srcdir)/build/build.mk
diff --git a/Makefile.am b/Makefile.am
index 3a2ca796..9394c5eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 SUBDIRS =	\
 	build	\
 	NotifySharp \
+	FriendFace \
 	SparkleLib \
 	SparkleShare \
 	SparkleDiff \
diff --git a/SparkleDiff/Makefile.am b/SparkleDiff/Makefile.am
index e9e0af07..8058db39 100644
--- a/SparkleDiff/Makefile.am
+++ b/SparkleDiff/Makefile.am
@@ -4,9 +4,6 @@ TARGET = exe
 LINK = $(REF_SPARKLEDIFF)
 
 SOURCES =  \
-	$(top_srcdir)/FriendFace/FriendFace.cs \
-	$(top_srcdir)/FriendFace/GravatarIconProvider.cs \
-	$(top_srcdir)/FriendFace/IconProvider.cs \
 	RevisionImage.cs \
 	RevisionView.cs \
 	SparkleDiff.cs \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 55878a56..8c870828 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -30,13 +30,17 @@ REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS
 LINK_NOTIFY_SHARP = -r:$(DIR_BIN)/NotifySharp.dll
 LINK_NOTIFY_SHARP_DEPS = $(REF_NOTIFY_SHARP) $(LINK_NOTIFY_SHARP)
 
+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_GTK) $(LINK_MONO_POSIX)
 LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
 LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
 
 REF_SPARKLESHARE = $(LINK_DBUS) $(LINK_NOTIFY_SHARP_DEPS) $(LINK_SPARKLELIB_DEPS)
 
-REF_SPARKLEDIFF = $(LINK_SPARKLELIB_DEPS)
+REF_SPARKLEDIFF = $(LINK_FRIENDFACE_DEPS) $(LINK_SPARKLELIB_DEPS)
 
 # Cute hack to replace a space with something
 colon:= :
diff --git a/configure.ac b/configure.ac
index cea7feff..5601fa7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,6 +88,7 @@ build/m4/shave/shave
 build/m4/shave/shave-libtool
 data/Makefile
 data/icons/Makefile
+FriendFace/Makefile
 NotifySharp/Makefile
 SparkleDiff/Makefile
 SparkleLib/AssemblyInfo.cs