diff -r 2a870d73ef4a glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java
--- a/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java	Mon Jul 02 08:41:13 2012 +0200
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/ServerDetails.java	Mon Jul 02 12:24:41 2012 +0200
@@ -112,6 +112,17 @@
         "http://serverplugins.netbeans.org/glassfishv3/post71v3-1-2.txt" // NOI18N
     ),
     /**
+     * details for an instance of GlassFish Server 3.1.2.1
+     */
+    GLASSFISH_SERVER_3_1_2_1(NbBundle.getMessage(ServerDetails.class, "STR_312_SERVER_NAME", new Object[]{}), // NOI18N
+        "deployer:gfv3ee6wc", // NOI18N
+        new String[]{"lib/install/applications/__admingui/WEB-INF/lib/console-core-3.1.2.1"}, // NOI18N
+        new String[0],
+        312,
+        "http://download.java.net/glassfish/3.1.2/release/glassfish-3.1.2-ml.zip?nbretriever=fallback", // NOI18N
+        "http://serverplugins.netbeans.org/glassfishv3/post72v3-1-2-1.txt" // NOI18N
+    ),
+    /**
      * details for an instance of GlassFish Server 4.0.0
      */
     GLASSFISH_SERVER_4_0(NbBundle.getMessage(ServerDetails.class, "STR_40_SERVER_NAME", new Object[]{}), // NOI18N
@@ -132,6 +143,8 @@
         ServerDetails sd = null;
         if (GLASSFISH_SERVER_4_0.isInstalledInDirectory(glassfishDir)) {
             sd = GLASSFISH_SERVER_4_0;
+        } else if (GLASSFISH_SERVER_3_1_2_1.isInstalledInDirectory(glassfishDir)) {
+            sd = GLASSFISH_SERVER_3_1_2_1;
         } else if (GLASSFISH_SERVER_3_1_2.isInstalledInDirectory(glassfishDir)) {
             sd = GLASSFISH_SERVER_3_1_2;
         } else if (GLASSFISH_SERVER_3_1_1.isInstalledInDirectory(glassfishDir)){
diff -r 2a870d73ef4a glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java
--- a/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java	Mon Jul 02 08:41:13 2012 +0200
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/GlassfishWizardProvider.java	Mon Jul 02 12:24:41 2012 +0200
@@ -81,6 +81,7 @@
         return new ServerWizardIterator(new ServerDetails[] { 
             ServerDetails.GLASSFISH_SERVER_3_1_1, 
             ServerDetails.GLASSFISH_SERVER_3_1_2,
+            ServerDetails.GLASSFISH_SERVER_3_1_2_1,
             ServerDetails.GLASSFISH_SERVER_4_0,
             ServerDetails.GLASSFISH_SERVER_3_0_1, 
             ServerDetails.GLASSFISH_SERVER_3, 
diff -r 2a870d73ef4a glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
--- a/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java	Mon Jul 02 08:41:13 2012 +0200
+++ b/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java	Mon Jul 02 12:24:41 2012 +0200
@@ -195,6 +195,7 @@
         return new ServerWizardIterator(new ServerDetails[] { 
             ServerDetails.GLASSFISH_SERVER_3_1_1,
             ServerDetails.GLASSFISH_SERVER_3_1_2,
+            ServerDetails.GLASSFISH_SERVER_3_1_2_1,
             ServerDetails.GLASSFISH_SERVER_4_0,
             ServerDetails.GLASSFISH_SERVER_3_0_1, 
             ServerDetails.GLASSFISH_SERVER_3_1,