diff --git a/Makefile.am b/Makefile.am
index a01cb1c1..34f6ed4b 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave
+
 basedirs = build Sparkles Sparkles/Git
 
 SUBDIRS = $(basedirs) $(GUISUBDIRS)
diff --git a/SparkleShare/Linux/Images/icons/hicolor/Makefile.am b/SparkleShare/Linux/Images/icons/hicolor/Makefile.am
index b9d1b14a..9341f2c7 100644
--- a/SparkleShare/Linux/Images/icons/hicolor/Makefile.am
+++ b/SparkleShare/Linux/Images/icons/hicolor/Makefile.am
@@ -1,9 +1,10 @@
 theme = hicolor
-system_themedir = $(datadir)/icons/$(theme)
 app_themedir = $(pkgdatadir)/icons/$(theme)
 
 if BUILD_XDG_APP
 system_themedir = $(app_themedir)
+else
+system_themedir = $(datadir)/icons/$(theme)
 endif
 
 system_theme_icons = \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index d09d9ea3..c3aceea6 100755
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -18,7 +18,7 @@ REF_SPARKLES = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
 LINK_SPARKLES = -r:$(DIR_BIN)/Sparkles.dll -r:$(DIR_BIN)/Sparkles.Git.dll
 LINK_SPARKLES_DEPS = $(REF_SPARKLES) $(LINK_SPARKLES)
 
-REF_SPARKLESHARE = $(LINK_GTK) $(LINK_SPARKLES_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
+REF_SPARKLESHARE = $(LINK_TESTS) $(LINK_GTK) $(LINK_SPARKLES_DEPS) $(LINK_APP_INDICATOR) $(LINK_WEBKIT)
 
 # Cute hack to replace a space with something
 colon:= :
diff --git a/build/build.rules.mk b/build/build.rules.mk
index 1fdba24a..678dc53d 100755
--- a/build/build.rules.mk
+++ b/build/build.rules.mk
@@ -19,7 +19,7 @@ ASSEMBLY_FILE = $(top_builddir)/bin/$(ASSEMBLY).$(ASSEMBLY_EXTENSION)
 INSTALL_DIR_RESOLVED = $(firstword $(subst , $(DEFAULT_INSTALL_DIR), $(INSTALL_DIR)))
 
 if ENABLE_TESTS
-    LINK = " $(NUNIT_LIBS)"
+    LINK_TESTS = "$(NUNIT_LIBS)"
     ENABLE_TESTS_FLAG = "-define:ENABLE_TESTS"
 endif
 
diff --git a/build/m4/shamrock/mono.m4 b/build/m4/shamrock/mono.m4
index 393eaa36..89813059 100755
--- a/build/m4/shamrock/mono.m4
+++ b/build/m4/shamrock/mono.m4
@@ -13,6 +13,11 @@ AC_DEFUN([SHAMROCK_FIND_MONO_4_0_COMPILER],
 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, dmcs)
 ])
 
+AC_DEFUN([SHAMROCK_FIND_MONO_4_5_COMPILER],
+[
+	SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, mcs)
+])
+
 AC_DEFUN([SHAMROCK_FIND_MONO_RUNTIME],
 [
 	SHAMROCK_FIND_PROGRAM_OR_BAIL(MONO, mono)
@@ -65,4 +70,3 @@ AC_DEFUN([SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES],
 		fi
 	done
 ])
-
diff --git a/configure.ac b/configure.ac
index c74b82c1..4c9f1af5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,9 @@ AC_PREREQ([2.54])
 AC_INIT([SparkleShare], sparkleshare_version)
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 dist-zip foreign tar-pax])
 AM_MAINTAINER_MODE
+LT_INIT
+
+AC_CONFIG_MACRO_DIRS([build/m4/sparkleshare build/m4/shamrock build/m4/shave])
 
 dnl Export Version Info
 AC_SUBST([ASM_VERSION], [sparkleshare_version])
@@ -15,20 +18,18 @@ if test "x$PKG_CONFIG" = "xno"; then
         AC_MSG_ERROR([pkg-config is not installed])
 fi
 
-AC_SUBST([ACLOCAL_AMFLAGS], ["-I build/m4/sparkleshare -I build/m4/shamrock -I build/m4/shave \${ACLOCAL_FLAGS}"])
-
 SHAMROCK_EXPAND_LIBDIR
 SHAMROCK_EXPAND_BINDIR
 SHAMROCK_EXPAND_DATADIR
 
 AC_PROG_INSTALL
 
-dnl Mono and gmcs
-SHAMROCK_CHECK_MONO_MODULE(2.8)
+dnl Mono and mcs
+SHAMROCK_CHECK_MONO_MODULE(3.2.8)
 SHAMROCK_FIND_MONO_RUNTIME
     
-PKG_CHECK_EXISTS([mono >= 2.8],
-[SHAMROCK_FIND_MONO_4_0_COMPILER
+PKG_CHECK_EXISTS([mono >= 3.2.8],
+[SHAMROCK_FIND_MONO_4_5_COMPILER
 SHAMROCK_CHECK_MONO_GAC_ASSEMBLIES([
     System
 ])]
@@ -114,13 +115,13 @@ SparkleShare/Makefile
 SparkleShare/Common/Makefile
 SparkleShare/Common/HTML/Makefile
 SparkleShare/Common/Presets/Makefile
-SparkleShare/Common/Pixmaps/Makefile
+SparkleShare/Common/Images/Makefile
 SparkleShare/Linux/Makefile
-SparkleShare/Linux/Pixmaps/Makefile
-SparkleShare/Linux/Pixmaps/icons/Makefile
-SparkleShare/Linux/Pixmaps/icons/hicolor/Makefile
-SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-dark/Makefile
-SparkleShare/Linux/Pixmaps/icons/ubuntu-mono-light/Makefile
+SparkleShare/Linux/Images/Makefile
+SparkleShare/Linux/Images/icons/Makefile
+SparkleShare/Linux/Images/icons/hicolor/Makefile
+SparkleShare/Linux/Images/icons/ubuntu-mono-dark/Makefile
+SparkleShare/Linux/Images/icons/ubuntu-mono-light/Makefile
 SparkleShare/Linux/sparkleshare
 ])