diff --git a/ChangeLog b/ChangeLog
index 57f5bcce2..f50f02317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-09  Mike Kestner  <mkestner@novell.com>
+
+	* configure.in.in : string quote the POLICY_VERSIONS.
+	* Makefile.include : multiple policy fixes.
+	* */Makefile.am : multiple policy fixes.
+
 2005-10-08  Mike Kestner  <mkestner@novell.com>
 
 	* generator/Signal.cs : handle enum return values GTypes.
diff --git a/Makefile.include b/Makefile.include
index 92d05f259..dea7c659c 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -47,7 +47,7 @@ AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
 	cp $(top_builddir)/AssemblyInfo.cs .
 
 $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config $(SNK)
-	@for i in "$(POLICY_VERSIONS)"; do	\
+	@for i in $(POLICY_VERSIONS); do	\
 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
 	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
 	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:$(SNK);	\
diff --git a/configure.in.in b/configure.in.in
index d32d59825..98e49ba6c 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -7,7 +7,7 @@ AM_MAINTAINER_MODE
 
 API_VERSION=@ASSEMBLY_VERSION@
 AC_SUBST(API_VERSION)
-POLICY_VERSIONS=@POLICY_VERSIONS@
+POLICY_VERSIONS="@POLICY_VERSIONS@"
 AC_SUBST(POLICY_VERSIONS)
 
 PACKAGE_VERSION=gtk-sharp-2.0
diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am
index 3250404db..439ec13ee 100644
--- a/gconf/GConf.PropertyEditors/Makefile.am
+++ b/gconf/GConf.PropertyEditors/Makefile.am
@@ -41,7 +41,7 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk
 	$(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)
 
 $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
-	@for i in "$(POLICY_VERSIONS)"; do	\
+	@for i in $(POLICY_VERSIONS); do	\
 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
 	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
 	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am
index 6c49061ca..b33a243aa 100644
--- a/gconf/GConf/Makefile.am
+++ b/gconf/GConf/Makefile.am
@@ -45,7 +45,7 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk
 	$(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources)
 
 $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
-	@for i in "$(POLICY_VERSIONS)"; do	\
+	@for i in $(POLICY_VERSIONS); do	\
 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
 	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
 	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
diff --git a/glib/Makefile.am b/glib/Makefile.am
index a66305c96..4c88102f4 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -88,7 +88,7 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
 	$(GAPI_CDECL_INSERT)
 
 $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
-	@for i in "$(POLICY_VERSIONS)"; do	\
+	@for i in $(POLICY_VERSIONS); do	\
 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
 	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
 	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\
diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am
index 90ac47ca9..e52874508 100644
--- a/gtkdotnet/Makefile.am
+++ b/gtkdotnet/Makefile.am
@@ -47,7 +47,7 @@ $(ASSEMBLY): $(build_sources) $(references) gtk-sharp.snk AssemblyInfo.cs
 	$(GAPI_CDECL_INSERT)
 
 $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
-	@for i in "$(POLICY_VERSIONS)"; do	\
+	@for i in $(POLICY_VERSIONS); do	\
 	  echo "Creating policy.$$i.$(ASSEMBLY)";	\
 	  sed -e "s/@ASSEMBLY_NAME@/$(ASSEMBLY_NAME)/" -e "s/@POLICY@/$$i/" $(top_builddir)/policy.config > policy.$$i.config;	\
 	  $(AL) -link:policy.$$i.config -out:policy.$$i.$(ASSEMBLY) -keyfile:gtk-sharp.snk;	\