diff --git a/makefiles/CopyFiles.gmk b/makefiles/CopyFiles.gmk
index 9ed6da26987d6d278e3b1300671b0afdb08d3725..ab3a360daaf4988dd89fa50ec26ee0fbbe80fbf5 100644
--- a/makefiles/CopyFiles.gmk
+++ b/makefiles/CopyFiles.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -294,45 +294,56 @@ JVMCFG := $(JVMCFG_DIR)/jvm.cfg
 
 
 ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
-    # On 32 bit machines, we can have client and/or server libjvms installed.
-    # Since the currently committed jvm.cfg expects clientANDserver, we need 
-    # to patch the jvm.cfg when we have built only a client or only a server.
-    # This should also support -kernel, -zero and -zeroshark.
-    ifeq ($(JVM_VARIANTS),$(COMMA)client$(COMMA))
-        # Create a patched jvm.cfg to use -client by default and alias -server to -client.
-        $(JVMCFG):
-		$(MKDIR) -p $(@D)
-		$(RM) $(JVMCFG)
-		$(PRINTF) "-client KNOWN\n">$(JVMCFG)
-		$(PRINTF) "-server ALIASED_TO -client\n">>$(JVMCFG)
-		$(PRINTF) "-hotspot ALIASED_TO -client\n">>$(JVMCFG)
-		$(PRINTF) "-classic WARN\n">>$(JVMCFG)
-		$(PRINTF) "-native ERROR\n">>$(JVMCFG)
-		$(PRINTF) "-green ERROR\n">>$(JVMCFG)
-
+  # On 32-bit machines we have three potential VMs: client, server and minimal.
+  # Historically we usually have both client and server and so that is what the
+  # committed jvm.cfg expects (including platform specific ergonomics switches
+  # to decide whether to use client or server by default). So when we have anything
+  # other than client and server we need to define a new jvm.cfg file.
+  # The main problem is deciding whether to use aliases for the VMs that are not
+  # present and the current position is that we add aliases for client and server, but
+  # not for minimal.
+  # To do: should this also support, -zero and -zeroshark?
+
+  CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
+
+  ifeq ($(CLIENT_AND_SERVER), true)
+    # Use the committed jvm.cfg for this 32 bit setup (the minimal
+    # VM is already KNOWN on platforms that potentially support it)
+    $(JVMCFG): $(JVMCFG_SRC)
+	$(call install-file)
+  else
+    $(JVMCFG):
+	$(MKDIR) -p $(@D)
+	$(RM) $(@)
+
+    # Now check for other permutations
+    ifeq ($(JVM_VARIANT_SERVER), true)
+	$(PRINTF) "-server KNOWN\n">>$(@)
+	$(PRINTF) "-client ALIASED_TO -server\n">>$(@)
+        ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	    $(PRINTF) "-minimal KNOWN\n">>$(@)
+        endif
     else
-        ifeq ($(JVM_VARIANTS),$(COMMA)server$(COMMA))
-            # Create a patched jvm.cfg to use -server by default and alias -client to -server.
-
-            $(JVMCFG):
-		$(MKDIR) -p $(@D)
-		$(RM) $(JVMCFG)
-		$(PRINTF) "-server KNOWN\n">$(JVMCFG)
-		$(PRINTF) "-client IGNORE\n">>$(JVMCFG)
-		$(PRINTF) "-hotspot IGNORE\n">>$(JVMCFG)
-		$(PRINTF) "-classic WARN\n">>$(JVMCFG)
-		$(PRINTF) "-native ERROR\n">>$(JVMCFG)
-		$(PRINTF) "-green ERROR\n">>$(JVMCFG)
+        ifeq ($(JVM_VARIANT_CLIENT), true)
+	    $(PRINTF) "-client KNOWN\n">>$(@)
+	    $(PRINTF) "-server ALIASED_TO -client\n">>$(@)
+            ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	        $(PRINTF) "-minimal KNOWN\n">>$(@)
+            endif
         else
-            # Use the default jvm.cfg for this 32 bit setup. 
-            $(JVMCFG): $(JVMCFG_SRC)
-	    	$(call install-file)
+            ifeq ($(JVM_VARIANT_MINIMAL1), true)
+	        $(PRINTF) "-minimal KNOWN\n">>$(@)
+	        $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
+	        $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
+            endif
         endif
     endif
+  endif
+
 else
     # Use the default jvm.cfg for this 64 bit setup.
     $(JVMCFG): $(JVMCFG_SRC)
-		$(call install-file)
+	$(call install-file)
 endif
 
 COPY_FILES += $(JVMCFG)
diff --git a/src/macosx/bin/x86_64/jvm.cfg b/src/macosx/bin/x86_64/jvm.cfg
index 7239804d39276f5bd19500a94255d8af4c31ab81..2502d2bacc3a77a2cf01a7f8a6e12866aa3e43c1 100644
--- a/src/macosx/bin/x86_64/jvm.cfg
+++ b/src/macosx/bin/x86_64/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff --git a/src/solaris/bin/amd64/jvm.cfg b/src/solaris/bin/amd64/jvm.cfg
index e13512085386c6cef6598367ba62a871f520e147..17c4be37ac9004640f78eaf34d66068113c62443 100644
--- a/src/solaris/bin/amd64/jvm.cfg
+++ b/src/solaris/bin/amd64/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff --git a/src/solaris/bin/arm/jvm.cfg b/src/solaris/bin/arm/jvm.cfg
index 1fb43de9916b14d3d222ffc9db7e5195e638d79c..e93034166b24d8ee8626517df7dc9f4497132cf7 100644
--- a/src/solaris/bin/arm/jvm.cfg
+++ b/src/solaris/bin/arm/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
diff --git a/src/solaris/bin/i586/jvm.cfg b/src/solaris/bin/i586/jvm.cfg
index f2c9822943b6b6fff6a4139e4cb235c6f40f4aec..4be4bb14b5f05b4a8dfaa3ecc14b5a159a047cb4 100644
--- a/src/solaris/bin/i586/jvm.cfg
+++ b/src/solaris/bin/i586/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client IF_SERVER_CLASS -server
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
diff --git a/src/solaris/bin/ia64/jvm.cfg b/src/solaris/bin/ia64/jvm.cfg
index 980fce43eeb3b35809f8454d16808da4e9caa5c8..f9d3b5ece40d417ff9472337c55c00b531f22f42 100644
--- a/src/solaris/bin/ia64/jvm.cfg
+++ b/src/solaris/bin/ia64/jvm.cfg
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,8 +36,4 @@
 # and may not be available in a future release.
 #
 -server KNOWN
--hotspot ERROR
--classic WARN
 -client IGNORE
--native ERROR
--green ERROR
diff --git a/src/solaris/bin/ppc/jvm.cfg b/src/solaris/bin/ppc/jvm.cfg
index 1fb43de9916b14d3d222ffc9db7e5195e638d79c..e93034166b24d8ee8626517df7dc9f4497132cf7 100644
--- a/src/solaris/bin/ppc/jvm.cfg
+++ b/src/solaris/bin/ppc/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
diff --git a/src/solaris/bin/sparc/jvm.cfg b/src/solaris/bin/sparc/jvm.cfg
index f2c9822943b6b6fff6a4139e4cb235c6f40f4aec..4be4bb14b5f05b4a8dfaa3ecc14b5a159a047cb4 100644
--- a/src/solaris/bin/sparc/jvm.cfg
+++ b/src/solaris/bin/sparc/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,8 +32,4 @@
 #
 -client IF_SERVER_CLASS -server
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
 -minimal KNOWN
diff --git a/src/solaris/bin/sparcv9/jvm.cfg b/src/solaris/bin/sparcv9/jvm.cfg
index 7b8853065f8c43cf85d91fe66ab5a5522baec26e..84f6d2706e8e0421eb7ef448507895385cb402e5 100644
--- a/src/solaris/bin/sparcv9/jvm.cfg
+++ b/src/solaris/bin/sparcv9/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,4 @@
 # and may not be available in a future release.
 #
 -server KNOWN
--hotspot ERROR
--classic WARN
 -client IGNORE
--native ERROR
--green ERROR
diff --git a/src/solaris/bin/zero/jvm.cfg b/src/solaris/bin/zero/jvm.cfg
index e13512085386c6cef6598367ba62a871f520e147..1b8d52792bc9f875bd19075d06b7ecfeb02e1efb 100644
--- a/src/solaris/bin/zero/jvm.cfg
+++ b/src/solaris/bin/zero/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ERROR
--classic WARN
--native ERROR
--green ERROR
diff --git a/src/windows/bin/amd64/jvm.cfg b/src/windows/bin/amd64/jvm.cfg
index 85bf091ad54579923e0fefac578d49c854b1002a..21ab9fd0fde66f6934567fb0d9e8e21ddee13f17 100644
--- a/src/windows/bin/amd64/jvm.cfg
+++ b/src/windows/bin/amd64/jvm.cfg
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ALIASED_TO -server
--classic WARN
--native ERROR
--green ERROR
diff --git a/src/windows/bin/i586/jvm.cfg b/src/windows/bin/i586/jvm.cfg
index c98ea61ce26259e11625f23315dd110922ff825f..2bacbb66feb2c87cc0cc0c0ca9d2516c86d1434c 100644
--- a/src/windows/bin/i586/jvm.cfg
+++ b/src/windows/bin/i586/jvm.cfg
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,3 @@
 #
 -client KNOWN
 -server KNOWN
--hotspot ALIASED_TO -client
--classic WARN
--native ERROR
--green ERROR
diff --git a/src/windows/bin/ia64/jvm.cfg b/src/windows/bin/ia64/jvm.cfg
index f5495caca9b4fad1bc9b13e22be40e910f7c4f25..ac0c8084224ad6ea0a9e964265b9dd84b1d5e860 100644
--- a/src/windows/bin/ia64/jvm.cfg
+++ b/src/windows/bin/ia64/jvm.cfg
@@ -1,7 +1,7 @@
 #
 # 
 # 
-# Copyright (c) 2002, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,3 @@
 #
 -server KNOWN
 -client IGNORE
--hotspot ALIASED_TO -server
--classic WARN
--native ERROR
--green ERROR