diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
index 5944afda51..cb2f842595 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapUtil.java
@@ -40,12 +40,12 @@ import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sonia.scm.net.ChildFirstURLClassLoader;
+import sonia.scm.plugin.ChildFirstPluginClassLoader;
+import sonia.scm.plugin.DefaultPluginClassLoader;
 
 //~--- JDK imports ------------------------------------------------------------
 
 import java.net.URL;
-import java.net.URLClassLoader;
 
 import java.util.List;
 
@@ -107,7 +107,7 @@ public final class BootstrapUtil
       {
         logger.info("using {} as plugin classloading strategy",
           STRATEGY_CHILDFIRST);
-        classLoader = new ChildFirstURLClassLoader(urls, parent);
+        classLoader = new ChildFirstPluginClassLoader(urls, parent);
       }
       else if (!STRATEGY_PARENTFIRST.equals(strategy))
       {
@@ -119,7 +119,7 @@ public final class BootstrapUtil
     {
       logger.info("using {} as plugin classloading strategy",
         STRATEGY_PARENTFIRST);
-      classLoader = new URLClassLoader(urls, parent);
+      classLoader = new DefaultPluginClassLoader(urls, parent);
     }
 
     return classLoader;
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/ChildFirstPluginClassLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/ChildFirstPluginClassLoader.java
new file mode 100644
index 0000000000..5e57825401
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/ChildFirstPluginClassLoader.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.plugin;
+
+//~--- non-JDK imports --------------------------------------------------------
+
+import sonia.scm.net.ChildFirstURLClassLoader;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.net.URL;
+
+/**
+ * Child first {@link ClassLoader} for SCM-Manager plugins.
+ *
+ * @author Sebastian Sdorra
+ */
+public class ChildFirstPluginClassLoader extends ChildFirstURLClassLoader
+  implements PluginClassLoader
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param urls
+   */
+  public ChildFirstPluginClassLoader(URL[] urls)
+  {
+    super(urls);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param urls
+   * @param parent
+   */
+  public ChildFirstPluginClassLoader(URL[] urls, ClassLoader parent)
+  {
+    super(urls, parent);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginClassLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginClassLoader.java
new file mode 100644
index 0000000000..532fb1dbff
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginClassLoader.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.plugin;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * Default {@link ClassLoader} for SCM-Manager plugins. This {@link ClassLoader}
+ * uses the default parent first strategy.
+ *
+ * @author Sebastian Sdorra
+ */
+public class DefaultPluginClassLoader extends URLClassLoader
+  implements PluginClassLoader
+{
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param urls
+   */
+  public DefaultPluginClassLoader(URL[] urls)
+  {
+    super(urls);
+  }
+
+  /**
+   * Constructs ...
+   *
+   *
+   * @param urls
+   * @param parent
+   */
+  public DefaultPluginClassLoader(URL[] urls, ClassLoader parent)
+  {
+    super(urls, parent);
+  }
+}
diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginClassLoader.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginClassLoader.java
new file mode 100644
index 0000000000..e9e87ebaa3
--- /dev/null
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginClassLoader.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer. 2. Redistributions in
+ * binary form must reproduce the above copyright notice, this list of
+ * conditions and the following disclaimer in the documentation and/or other
+ * materials provided with the distribution. 3. Neither the name of SCM-Manager;
+ * nor the names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.plugin;
+
+//~--- JDK imports ------------------------------------------------------------
+
+import java.io.Closeable;
+
+/**
+ * The PluginClassLoader interface is mainly a marker to find the class loader
+ * in a memory dump. This should make it easier to find class loader leaks.
+ *
+ * @author Sebastian Sdorra
+ */
+public interface PluginClassLoader {}