diff --git a/build/m4/Makefile.am b/build/m4/Makefile.am
index 30385548..2492a2c7 100644
--- a/build/m4/Makefile.am
+++ b/build/m4/Makefile.am
@@ -1,6 +1,7 @@
 EXTRA_DIST = \
 	$(srcdir)/sparkleshare/*.m4 \
-	$(srcdir)/shamrock/*.m4 
+	$(srcdir)/shamrock/*.m4 \
+	$(srcdir)/shave/*.m4 
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/configure.ac b/configure.ac
index 7a3f26fb..d3333527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,21 +75,22 @@ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([
     Mono.Posix
 ])
 
-
+SHAVE_INIT([build/m4/shave], [enable])
 
 
 AC_OUTPUT([
 build/Makefile
 build/m4/Makefile
+build/m4/shave/shave
+build/m4/shave/shave-libtool
+data/Makefile
+data/icons/Makefile
 notify-sharp/Makefile
 SparkleShare/sparkleshare
 SparkleShare/Defines.cs
 SparkleShare/AssemblyInfo.cs
 SparkleShare/Makefile
-data/Makefile
-data/icons/Makefile
 po/Makefile.in
 Makefile
-
 ])
 
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..2bf7d453
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,9 @@
+SUBDIRS = \
+	icons
+
+EXTRA_DIST = \
+	sparkleshare.svg
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+