diff --git a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
index 00298ae362..921bda826b 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutor.java
@@ -161,10 +161,22 @@ public class DefaultCGIExecutor extends AbstractCGIExecutor
       }
     }
 
-    Process p = Runtime.getRuntime().exec(execCmd, environment.getEnvArray(),
+    Process p = null;
+
+    try
+    {
+      p = Runtime.getRuntime().exec(execCmd, environment.getEnvArray(),
                   workDirectory);
 
-    execute(p);
+      execute(p);
+    }
+    finally
+    {
+      if (p != null)
+      {
+        p.destroy();
+      }
+    }
   }
 
   /**