Index: pom.xml
===================================================================
--- pom.xml	(revision 50803)
+++ pom.xml	(working copy)
@@ -122,7 +122,7 @@
         <mojarra.version>2.1.4</mojarra.version>
         <jsf-ext.version>0.2</jsf-ext.version>
         <woodstock.version>4.0.2.8</woodstock.version>
-        <grizzly.version>1.9.39</grizzly.version>
+        <grizzly.version>1.9.40</grizzly.version>
         <jsr181-api.version>1.0-MR1</jsr181-api.version>
         <saaj-api.version>1.3</saaj-api.version>
         <hk2.version>1.1.11</hk2.version>
@@ -986,6 +986,12 @@
 
             <dependency>
                 <groupId>com.sun.grizzly</groupId>
+                <artifactId>grizzly-http-ajp</artifactId>
+                <version>${grizzly.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.sun.grizzly</groupId>
                 <artifactId>grizzly-messagesbus</artifactId>
                 <version>${grizzly.version}</version>
             </dependency>
Index: web/pom.xml
===================================================================
--- web/pom.xml	(revision 50803)
+++ web/pom.xml	(working copy)
@@ -57,7 +57,7 @@
     <modules>
         <module>web-naming</module>
         <module>web-core</module>
-        <module>web-ajp</module>
+<!--        <module>web-ajp</module>-->
         <module>war-util</module>
         <module>jstl-connector</module>
         <module>jsf-connector</module>
Index: web/webtier-all/pom.xml
===================================================================
--- web/webtier-all/pom.xml	(revision 50803)
+++ web/webtier-all/pom.xml	(working copy)
@@ -113,10 +113,9 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.web</groupId>
-            <artifactId>web-ajp</artifactId>
-            <version>${project.version}</version>
-    	</dependency> 
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-http-ajp</artifactId>
+        </dependency> 
         <dependency>
             <groupId>org.glassfish.main.web.web-embed</groupId>
             <artifactId>web-embed-api</artifactId>
Index: packager/resources/pkg_conf.py
===================================================================
--- packager/resources/pkg_conf.py	(revision 50803)
+++ packager/resources/pkg_conf.py	(working copy)
@@ -65,7 +65,7 @@
 javadb_version="10.5.3.0,0-0"
 corba_version="3.1.0,0-30"
 jsf_version="2.1.4,0-4"
-grizzly_version="1.9.39,0-1"
+grizzly_version="1.9.40,0-1"
 metro_version="2.2,0-4"
 javahelp_version="2.0.2,0-1"
 shoal_version="1.6.13,0-0"
Index: common/container-common/pom.xml
===================================================================
--- common/container-common/pom.xml	(revision 50803)
+++ common/container-common/pom.xml	(working copy)
@@ -159,6 +159,14 @@
             <artifactId>grizzly-websockets</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-http-ajp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.grizzly</groupId>
+            <artifactId>grizzly-config</artifactId>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>