Index: src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml
===================================================================
--- src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml	(revision 57434)
+++ src/main/resources/archetype-resources/site/src/main/webapp/WEB-INF/web.xml	(working copy)
@@ -100,6 +100,11 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+  <!-- HstContextLoaderListener configuring/initializing/destroying HST Container -->
+  <listener>
+    <listener-class>org.hippoecm.hst.site.container.HstContextLoaderListener</listener-class>
+  </listener>
+
   <!-- Listener that dispatches http session events to ComponentManager. -->
   <listener>
     <listener-class>org.hippoecm.hst.site.container.session.HttpSessionEventPublisher</listener-class>
@@ -106,22 +111,6 @@
   </listener>
 
   <servlet>
-    <servlet-name>HstSiteConfigServlet</servlet-name>
-    <servlet-class>org.hippoecm.hst.site.container.HstSiteConfigServlet</servlet-class>
-    <!--
-      If 'hst-config-refresh-delay' parameter is greater than 0,
-      then the HST configuration file changes will be monitored to re-initialize the HST Container.
-      The value is in ms. If set to 0 or missing, the re-initialization option on configuration file changes is not turned on.
-      Default below is set to 3 sec
-    -->
-    <init-param>
-      <param-name>hst-config-refresh-delay</param-name>
-      <param-value>3000</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-  <servlet>
     <servlet-name>BinariesServlet</servlet-name>
     <servlet-class>org.hippoecm.hst.servlet.BinariesServlet</servlet-class>
   </servlet>