diff --git a/Makefile.am b/Makefile.am
index f219324d..77c913f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,15 @@
 SUBDIRS =	\
 	build	\
 	help	\
-	${SPARKLE_SMARTIRC4NETDIR} \
+	SmartIrc4net \
 	SparkleLib \
 	SparkleShare \
 	data \
 	po
 
-EXTRA_DIST = gnome-doc-utils.make \
-             LICENSE
+EXTRA_DIST = \
+	gnome-doc-utils.make \
+	LICENSE
 
 DISTCLEANFILES = \
 	intltool-extract        \
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index b29fa922..3cb4dcd3 100644
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -1,8 +1,11 @@
 ASSEMBLY = SparkleLib
 TARGET = library
 
-LINK = $(REF_SPARKLELIB)
-
+if HAVE_SMARTIRC4NET
+LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_SYSTEM)
+else
+LINK = $(REF_SPARKLELIB) $(LINK_SMARTIRC4NET_LOCAL)
+endif
 
 SOURCES =  \
 	Defines.cs \
diff --git a/build/build.environment.mk b/build/build.environment.mk
index 59717142..806d0f13 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -15,7 +15,7 @@ LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GNOME = $(GNOME_SHARP_LIBS)
 LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
 LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
-LINK_SMARTIRC4NET = $(SMARTIRC4NET_LIBS)
+LINK_SMARTIRC4NET_SYSTEM = $(SMARTIRC4NET_LIBS)
 LINK_SMARTIRC4NET_LOCAL = -r:$(abs_top_builddir)/$(SMARTIRC4NET_ASSEMBLY)
 
 REF_NOTIFY_SHARP = $(LINK_SYSTEM) $(LINK_DBUS) $(GTKSHARP_LIBS) $(GLIBSHARP_LIBS)
@@ -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) $(LINK_SMARTIRC4NET_LOCAL)
+REF_SPARKLELIB = $(LINK_SYSTEM) $(LINK_MONO_POSIX)
 LINK_SPARKLELIB = -r:$(DIR_BIN)/SparkleLib.dll
 LINK_SPARKLELIB_DEPS = $(REF_SPARKLELIB) $(LINK_SPARKLELIB)
 
diff --git a/configure.ac b/configure.ac
index 6c3ba1dd..b89c6aba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,15 +79,16 @@ dnl package checks, common for all configs
 
 SPARKLESHARE_CHECK_GTK_SHARP
 
+SPARKLESHARE_SMARTIRC4NET
 PKG_CHECK_MODULES([SMARTIRC4NET], [smartirc4net],
-	SPARKLE_SMARTIRC4NETDIR=""
+	SMARTIRC4NET_ASSEMBLY=""
+	AC_SUBST(SMARTIRC4NET_ASSEMBLY)
 	,
-	SPARKLESHARE_SMARTIRC4NET
  	SMARTIRC4NET_LIBS=""
 	AC_SUBST(SMARTIRC4NET_LIBS)
-	SPARKLE_SMARTIRC4NETDIR="SmartIrc4net"
 	AC_SUBST(SPARKLE_SMARTIRC4NETDIR)
 )
+AM_CONDITIONAL(HAVE_SMARTIRC4NET, test x$SPARKLE_SMARTIRC4NETDIR = x)
 
 dnl check for webkit-sharp
 PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, have_webkit_sharp=yes, have_webkit_sharp=no)