diff --git a/AssemblyInfo.cs.in b/AssemblyInfo.cs.in
index 1ff6d5e00..474e9d69f 100644
--- a/AssemblyInfo.cs.in
+++ b/AssemblyInfo.cs.in
@@ -3,5 +3,4 @@ using System.Runtime.CompilerServices;
 
 [assembly:AssemblyVersion("@API_VERSION@")]
 [assembly:AssemblyDelaySign(false)]
-[assembly:AssemblyKeyFile("gtk-sharp.snk")]
 [assembly:GLib.IgnoreClassInitializers]
diff --git a/Makefile.am b/Makefile.am
index c6dca227f..ed42497db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,6 @@
 SUBDIRS = sources generator parser glib gio cairo pango atk gdk gtk gtkdotnet sample doc
 
 EXTRA_DIST = 			\
-	mono.snk		\
 	gtk-sharp.snk		\
 	policy.config.in	\
 	AssemblyInfo.cs.in	\
diff --git a/Makefile.include b/Makefile.include
index ef3422b8b..a6f0b52d1 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -1,4 +1,4 @@
-SNK = gtk-sharp.snk
+SNK = $(top_srcdir)/gtk-sharp.snk
 API = $(pkg)-api.xml
 RAW_API = $(pkg)-api.raw
 
@@ -10,7 +10,7 @@ noinst_DATA = $(TARGET)
 TARGET_API = $(pkg:=-api.xml)
 gapidir = $(datadir)/gapi-3.0
 gapi_DATA = $(TARGET_API)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) AssemblyInfo.cs $(POLICY_CONFIGS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c AssemblyInfo.cs $(POLICY_CONFIGS)
 DISTCLEANFILES = $(ASSEMBLY).config
 
 POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS)))
@@ -40,9 +40,6 @@ generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.ex
 	--glue-includes=$(glue_includes)						\
 	&& touch generated-stamp
 
-$(SNK): $(top_srcdir)/$(SNK)
-	cp $(top_srcdir)/$(SNK) .
-
 AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
 	cp $(top_builddir)/AssemblyInfo.cs .
 
@@ -57,7 +54,7 @@ build_references = $(addprefix -r:, $(references)) $(MONO_CAIRO_LIBS)
 
 $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
+	$(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
 
 install-data-local:
 	@if test -n '$(pkg)'; then							\
diff --git a/cairo/AssemblyInfo.cs b/cairo/AssemblyInfo.cs
index f31b62e7e..f112aef19 100644
--- a/cairo/AssemblyInfo.cs
+++ b/cairo/AssemblyInfo.cs
@@ -3,4 +3,3 @@ using System.Runtime.CompilerServices;
 
 [assembly:AssemblyVersion("2.0.0.0")]
 [assembly:AssemblyDelaySign(false)]
-[assembly:AssemblyKeyFile("mono.snk")]
diff --git a/cairo/Makefile.am b/cairo/Makefile.am
index 33bceab67..799a5402d 100644
--- a/cairo/Makefile.am
+++ b/cairo/Makefile.am
@@ -1,5 +1,6 @@
 ASSEMBLY_NAME = Mono.Cairo
 ASSEMBLY = $(ASSEMBLY_NAME).dll
+SNK = $(srcdir)/mono.snk
 
 if ENABLE_MONO_CAIRO
 TARGET=$(ASSEMBLY)
@@ -9,7 +10,7 @@ endif
 
 noinst_DATA = $(TARGET)
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb mono.snk
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb
 
 sources = \
 	Antialias.cs \
@@ -64,12 +65,9 @@ sources = \
 
 build_sources = $(addprefix $(srcdir)/, $(sources))
 
-mono.snk: $(top_srcdir)/mono.snk
-	cp $(top_srcdir)/mono.snk .
-
-$(ASSEMBLY): $(build_sources) mono.snk
+$(ASSEMBLY): $(build_sources) $(SNK)
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
+	$(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
 
 install-data-local:
 	@if test -n '$(TARGET)'; then							\
@@ -83,5 +81,5 @@ uninstall-local:
 	  $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1;			\
 	fi
 
-EXTRA_DIST = $(sources)
+EXTRA_DIST = $(sources) mono.snk
 
diff --git a/mono.snk b/cairo/mono.snk
similarity index 100%
rename from mono.snk
rename to cairo/mono.snk
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 8158db23f..53f036698 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS =
 
+SNK = $(top_srcdir)/gtk-sharp.snk
 TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 ASSEMBLY_NAME = glib-sharp
@@ -9,7 +10,7 @@ pkgconfig_DATA = glib-sharp-3.0.pc
 gapidir = $(datadir)/gapi-3.0
 gapi_DATA = glib-api.xml
 
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
 DISTCLEANFILES = $(ASSEMBLY).config
 
 POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS)))
@@ -86,21 +87,18 @@ EXTRA_DIST =				\
 	glib-sharp-3.0.pc.in		\
 	glib-api.xml
 
-gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
-	cp $(top_srcdir)/gtk-sharp.snk .
-
 AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
 	cp $(top_builddir)/AssemblyInfo.cs .
 
-$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
+$(ASSEMBLY): $(build_sources) $(SNK) AssemblyInfo.cs
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
+	$(CSC) $(CSFLAGS) -keyfile:$(SNK) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
 
 policy.%.config: $(top_builddir)/policy.config
 	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
 
-$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
+	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
 
 install-data-local:
 	@if test -n '$(TARGET)'; then							\
diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am
index b774c7782..a60d3f2f1 100644
--- a/gtkdotnet/Makefile.am
+++ b/gtkdotnet/Makefile.am
@@ -6,10 +6,11 @@ else
 TARGET =
 endif
 
+SNK = $(top_srcdir)/gtk-sharp.snk
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 ASSEMBLY_NAME = gtk-dotnet
 noinst_DATA = $(ASSEMBLY) $(POLICY_ASSEMBLIES)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb AssemblyInfo.cs $(POLICY_ASSEMBLIES) $(POLICY_CONFIGS)
 DISTCLEANFILES = $(ASSEMBLY).config
 
 POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS)))
@@ -28,21 +29,18 @@ EXTRA_DIST =				\
 	$(ASSEMBLY).config.in		\
 	gtk-dotnet-3.0.pc.in
 
-gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
-	cp $(top_srcdir)/gtk-sharp.snk .
-
 AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
 	cp $(top_builddir)/AssemblyInfo.cs .
 
-$(ASSEMBLY): $(build_sources) $(references) gtk-sharp.snk AssemblyInfo.cs
+$(ASSEMBLY): $(build_sources) $(references) $(SNK) AssemblyInfo.cs
 	@rm -f $(ASSEMBLY).mdb
-	$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources)
+	$(CSC) $(CSFLAGS) -keyfile:$(SNK) -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources)
 
 policy.%.config: $(top_builddir)/policy.config
 	sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$*/" $(top_builddir)/policy.config > $@
 
-$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config gtk-sharp.snk
-	$(AL) -link:policy.$*.config -out:$@ -keyfile:gtk-sharp.snk
+$(POLICY_ASSEMBLIES) : policy.%.$(ASSEMBLY): policy.%.config $(SNK)
+	$(AL) -link:policy.$*.config -out:$@ -keyfile:$(SNK)
 
 install-data-local:
 	@if test -n '$(TARGET)'; then							\