diff --git a/Makefile.am b/Makefile.am
index 14044b90..b5ffd702 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,6 +10,9 @@ SUBDIRS =	\
 	data \
 	po
 
+clean-local:
+	rm -rf $(top_builddir)/bin
+
 EXTRA_DIST = gnome-doc-utils.make
 
 DISTCLEANFILES = \
diff --git a/SparkleLib/Makefile.am b/SparkleLib/Makefile.am
index 7f08611e..901d8377 100644
--- a/SparkleLib/Makefile.am
+++ b/SparkleLib/Makefile.am
@@ -15,4 +15,18 @@ SOURCES =  \
 	SparklePlatform.cs \
 	SparkleRepo.cs
 
+SMARTIRC4NET_FILES_EXPANDED = $(foreach file, $(SMARTIRC4NET_FILES), $(top_builddir)/$(file))
+
+EXTRA_BUNDLE = $(SMARTIRC4NET_FILES_EXPANDED)
+
+install-data-hook:
+	for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
+		$(INSTALL) -m 0755 $$ASM $(DESTDIR)$(moduledir); \
+	done;
+
+uninstall-hook:
+	for ASM in $(SMARTIRC4NET_FILES_EXPANDED); do \
+		rm -f $(DESTDIR)$(moduledir)/`basename $$ASM`; \
+	done;
+
 include $(top_srcdir)/build/build.mk
diff --git a/build/m4/sparkleshare/smartirc4net.m4 b/build/m4/sparkleshare/smartirc4net.m4
index fedc36ea..9cb1099b 100644
--- a/build/m4/sparkleshare/smartirc4net.m4
+++ b/build/m4/sparkleshare/smartirc4net.m4
@@ -3,7 +3,14 @@ AC_DEFUN([SPARKLESHARE_SMARTIRC4NET],
 	if test ! -d "$srcdir/SmartIrc4net"; then
 		AC_MSG_ERROR([SmartIrc4net folder not found])
 	fi
+	ac_configure_args="$ac_configure_args --disable-pkg-config --disable-pkg-lib --disable-pkg-gac"
 	AC_CONFIG_SUBDIRS([SmartIrc4net])
-	AC_SUBST([SMARTIRC4NET_ASSEMBLY], "SmartIrc4net/bin/Meebey.SmartIrc4net.dll")
+	asm="SmartIrc4net/bin/Meebey.SmartIrc4net.dll"
+	SMARTIRC4NET_ASSEMBLY="$asm"
+	SMARTIRC4NET_FILES="$asm"
+	[[ -r "$asm.mdb" ]] && SMARTIRC4NET_FILES="$SMARTIRC4NET_FILES $asm.mdb"
+
+	AC_SUBST([SMARTIRC4NET_ASSEMBLY])
+	AC_SUBST([SMARTIRC4NET_FILES])
 ])