diff --git a/Kieker.WebGUI/descriptors/descriptor-bin.xml b/Kieker.WebGUI/descriptors/descriptor-bin.xml
index 54cc18fcf30244fd0ba6ed3030a1f41f81f682fa..ae281d4311074df5159eaf7ee9615c8a8e08b850 100644
--- a/Kieker.WebGUI/descriptors/descriptor-bin.xml
+++ b/Kieker.WebGUI/descriptors/descriptor-bin.xml
@@ -11,10 +11,20 @@
         <fileSet>
             <includes>
                 <include>
-                    **/${project.build.directory}/Kieker.WebGUI*.war
+                    Kieker.WebGUI*.war
                 </include>
             </includes>
             <outputDirectory>/</outputDirectory>  
+            <directory>${project.build.directory}/</directory>
+        </fileSet>
+        <fileSet>
+            <includes>
+                <include>
+                    jetty-runner-*.jar
+                </include>
+            </includes>
+            <outputDirectory>/</outputDirectory>  
+            <directory>${project.build.directory}/Kieker.WebGUI-${project.version}/WEB-INF/lib/</directory>
         </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 02cc21cc8c051a6f26cd1a85cd37bd896bc5ddbd..da0af6eb18489c1c908fe954eeab05fe6b3c32be 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -229,6 +229,11 @@
             <artifactId>commons-fileupload</artifactId>
             <version>1.2.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-runner</artifactId>
+            <version>8.1.0.v20120127</version>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -242,61 +247,7 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <configLocation>quality-config/cs-conf.xml</configLocation>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>checkstyle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <excludeFilterFile>quality-config/fb-filter.xml</excludeFilterFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>findbugs</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <rulesets>
-                        <ruleset>
-                            quality-config/pmdrules.xml
-                        </ruleset>
-                    </rulesets>
-                    <targetJdk>1.6</targetJdk>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>pmd</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+           
             <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -323,12 +274,31 @@
                         <endorseddirs>${endorsed.dir}</endorseddirs>
                     </compilerArguments>
                 </configuration>
+            </plugin>
+             <!-- This is some kind of a hack, as maven doesn't want to include system jars into the war-file. We use ant instead. -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${project.basedir}/lib/kieker-1.5-SNAPSHOT.jar"
+                                      todir="${project.build.directory}/Kieker.WebGUI-${project.version}/WEB-INF/lib"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.1.1</version>
                 <configuration>
+                    <packagingExcludes>WEB-INF/lib/jetty-runner-*.jar</packagingExcludes>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>