diff --git a/app.server.properties b/app.server.properties
index 657415673a05b5..55feb63a83f430 100644
--- a/app.server.properties
+++ b/app.server.properties
@@ -48,8 +48,7 @@
 ## Glassfish
 ##
 
-    app.server.glassfish.version.id=3.1.1
-    app.server.glassfish.dir=${app.server.parent.dir}/glassfish-${app.server.glassfish.version.id}
+    app.server.glassfish.dir=${app.server.parent.dir}/glassfish-3.1.1
     app.server.glassfish.bin.dir=${app.server.glassfish.dir}/bin
     app.server.glassfish.classes.global.dir=${app.server.glassfish.instance.dir}/lib/classes
     app.server.glassfish.classes.portal.dir=${app.server.glassfish.portal.dir}/WEB-INF/classes
@@ -63,9 +62,8 @@
     app.server.glassfish.portal.dir=${app.server.glassfish.deploy.dir}/liferay-portal.war
     app.server.glassfish.temp.dir=${app.server.glassfish.instance.dir}/logs
     app.server.glassfish.work.dir=${app.server.glassfish.instance.dir}/logs
-    app.server.glassfish.zip.name=glassfish-${app.server.glassfish.version.id}-web.zip
-    app.server.glassfish.zip.glob=glassfish3/glassfish
-    app.server.glassfish.zip.url=http://download.java.net/glassfish/${app.server.glassfish.version.id}/release/${app.server.glassfish.zip.name}
+    app.server.glassfish.zip.name=glassfish-3.1.1-web.zip
+    app.server.glassfish.zip.url=http://download.java.net/glassfish/3.1.1/release/${app.server.glassfish.zip.name}
 
 ##
 ## JBoss
diff --git a/build-dist.xml b/build-dist.xml
index 7565754d9ce832..1230ad1d463952 100644
--- a/build-dist.xml
+++ b/build-dist.xml
@@ -834,10 +834,12 @@ release was successful.</echo>
 			 dest="${app.server.parent.dir}"
 			 src="${app.server.parent.dir}/${app.server.glassfish.zip.name}"
 		>
-			<patternset includes="${app.server.glassfish.zip.glob}/**" />
+			<patternset
+				includes="glassfish3/glassfish/**"
+			/>
 			<mapper
 				type="glob"
-				from="${app.server.glassfish.zip.glob}/*"
+				from="glassfish3/glassfish/*"
 				to="${app.server.glassfish.dir}/*"
 			/>
 		</unzip>
diff --git a/build-test-glassfish.xml b/build-test-glassfish.xml
index 922a8e92b402bb..7f1d36f8c9b414 100644
--- a/build-test-glassfish.xml
+++ b/build-test-glassfish.xml
@@ -5,7 +5,7 @@
 
 	<target name="run-glassfish">
 		<antcall target="run-simple-server">
-			<param name="simple.server.dir" value="${app.server.parent.dir}/glassfish-3.0.1" />
+			<param name="simple.server.dir" value="${app.server.parent.dir}/glassfish-3.1.1" />
 			<param name="simple.server.bin.dir" value="${app.server.glassfish.dir}/bin" />
 			<param name="simple.server.deploy.dir" value="${app.server.glassfish.instance.dir}/autodeploy" />
 			<param name="simple.server.lib.global.dir" value="${app.server.glassfish.instance.dir}/lib" />