diff --git a/build-win32 b/build-win32
index b545b32..558e280 100755
--- a/build-win32
+++ b/build-win32
@@ -41,8 +41,8 @@ cp -r "win32/gtksharp/"* "${INSTALLDIR}/"
 find "${INSTALLDIR}/" -name .svn -prune -exec rm -rf '{}' ';'
 
 # Install pipi-sharp
-mv "${INSTALLDIR}/lib/pipi-sharp/"* "${INSTALLDIR}/bin/"
-rm -Rf "${INSTALLDIR}/lib/pipi-sharp"
+mv "${INSTALLDIR}/lib/mono/gac/pipi-sharp/"*/* "${INSTALLDIR}/bin/"
+rm -Rf "${INSTALLDIR}/lib/mono"
 
 mkdir "${INSTALLDIR}/doc"
 for f in COPYING NOTES; do
diff --git a/pipi-sharp/Makefile.am b/pipi-sharp/Makefile.am
index 7329656..1257b84 100644
--- a/pipi-sharp/Makefile.am
+++ b/pipi-sharp/Makefile.am
@@ -19,7 +19,8 @@ EXTRA_DIST = $(pipi_sources) $(test_sources) \
 	pipi-sharp.snk pipi-sharp.pc.in pipi-sharp.dll.config.in
 
 pipi-sharp.dll: $(pipi_sources)
-	$(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library
+	$(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library \
+	  -keyfile:$(srcdir)/pipi-sharp.snk
 
 test.exe: $(test_sources) pipi-sharp.dll
 	$(GMCS) -debug $(test_sources) -out:$@ -lib:./ \