diff --git a/scm-web-api/src/main/java/sonia/scm/web/ScmWebPlugin.java b/scm-web-api/src/main/java/sonia/scm/web/ScmWebPlugin.java
index 61107d81c9..663e84ce67 100644
--- a/scm-web-api/src/main/java/sonia/scm/web/ScmWebPlugin.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/ScmWebPlugin.java
@@ -7,14 +7,6 @@
 
 package sonia.scm.web;
 
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.inject.Module;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.InputStream;
-
 /**
  *
  * @author Sebastian Sdorra
@@ -22,7 +14,19 @@ import java.io.InputStream;
 public interface ScmWebPlugin
 {
 
-public void contextInitialized( ScmWebPluginContext context );
+  /**
+   * Method description
+   *
+   *
+   * @param context
+   */
+  public void contextDestroyed(ScmWebPluginContext context);
 
-public void contextDestroyed( ScmWebPluginContext context );
+  /**
+   * Method description
+   *
+   *
+   * @param context
+   */
+  public void contextInitialized(ScmWebPluginContext context);
 }
diff --git a/scm-web-api/src/main/java/sonia/scm/web/ScmWebPluginContext.java b/scm-web-api/src/main/java/sonia/scm/web/ScmWebPluginContext.java
index d09ebe8a8d..a88e381984 100644
--- a/scm-web-api/src/main/java/sonia/scm/web/ScmWebPluginContext.java
+++ b/scm-web-api/src/main/java/sonia/scm/web/ScmWebPluginContext.java
@@ -17,6 +17,8 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.servlet.ServletContext;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -24,6 +26,19 @@ import java.util.Set;
 public class ScmWebPluginContext
 {
 
+  /**
+   * Constructs ...
+   *
+   *
+   * @param servletContext
+   */
+  public ScmWebPluginContext(ServletContext servletContext)
+  {
+    this.servletContext = servletContext;
+  }
+
+  //~--- methods --------------------------------------------------------------
+
   /**
    * Method description
    *
@@ -92,6 +107,17 @@ public class ScmWebPluginContext
     return scriptResources;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  public ServletContext getServletContext()
+  {
+    return servletContext;
+  }
+
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
@@ -99,4 +125,7 @@ public class ScmWebPluginContext
 
   /** Field description */
   private Set<Module> injectModules = new HashSet<Module>();
+
+  /** Field description */
+  private ServletContext servletContext;
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/ContextListener.java b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
index 5c39f078ee..0be650c1bf 100644
--- a/scm-webapp/src/main/java/sonia/scm/ContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
@@ -62,7 +62,8 @@ public class ContextListener extends GuiceServletContextListener
   @Override
   public void contextInitialized(ServletContextEvent servletContextEvent)
   {
-    webPluginContext = new ScmWebPluginContext();
+    webPluginContext =
+      new ScmWebPluginContext(servletContextEvent.getServletContext());
 
     List<ScmWebPlugin> plugins = ServiceUtil.getServices(ScmWebPlugin.class);