diff --git a/pom.xml b/pom.xml
index ce036d1be72b0fc13a6158ee6eb975020f9bb590..9ee3d8fe0993bbc6b872ab21c2df957b56368386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,12 +260,12 @@
 				</reportSets>
 			</plugin>
 
-			<!--
-				<plugin> generation of JavaDoc
+			<!-- TEST ME -->
+			<plugin> 
+				<!-- generation of JavaDoc -->
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId> <version>2.5</version>
-				</plugin>
-			-->
+			</plugin>
 
 			<plugin>
 				<!-- style checker -->
@@ -339,12 +339,16 @@
 						<goals>
 							<goal>aggregate-jar</goal>
 						</goals>
-						<phase>site</phase>
+						<phase>package</phase>
 						<configuration>
 							<quiet>true</quiet>
 						</configuration>
 					</execution>
 				</executions>
+				<configuration>
+					<!-- exclude example classes from JavaDoc -->
+					<excludePackageNames>eu.stratosphere.nephele.example.*:eu.stratosphere.pact.example.*</excludePackageNames>
+				</configuration> 
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/stratosphere-dist/pom.xml b/stratosphere-dist/pom.xml
index 5d17d6b80129bbc04484debe0f282557f1e6d5a5..2fc4c78c98cf870878ef71480a25a8f35d8dfe6b 100644
--- a/stratosphere-dist/pom.xml
+++ b/stratosphere-dist/pom.xml
@@ -128,8 +128,10 @@
                 <configuration>
                     <descriptors>
                         <descriptor>src/main/assemblies/bin.xml</descriptor>
+                        <!--
                         <descriptor>src/main/assemblies/src.xml</descriptor>
-			        </descriptors>
+                        -->
+	            </descriptors>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/stratosphere-dist/src/main/assemblies/bin.xml b/stratosphere-dist/src/main/assemblies/bin.xml
index a0dd155c282e85f89ad1026c1a006fa11a3c179d..c689ebce05689d4ceb7840ee65c46805c11f34bb 100644
--- a/stratosphere-dist/src/main/assemblies/bin.xml
+++ b/stratosphere-dist/src/main/assemblies/bin.xml
@@ -65,8 +65,8 @@
     	<fileSet>
     	<!-- copy JavaDocs -->
     		<!--
-    		<directory>../target/apidocs</directory>
-    		-->
+    		<directory>../target/apidocs</directory
+		-->
     		<directory>../target</directory>
     		<includes>
     			<include>stratosphere-*-javadoc.jar</include>
diff --git a/stratosphere-dist/src/main/assemblies/src.xml b/stratosphere-dist/src/main/assemblies/src.xml
index dae4828145971f0a7388363b45d09f08daca9e1b..61e45c786f7a0594a123c2e375bf9a8e783a662a 100644
--- a/stratosphere-dist/src/main/assemblies/src.xml
+++ b/stratosphere-dist/src/main/assemblies/src.xml
@@ -63,13 +63,13 @@
     	<!-- copy JavaDocs -->
     		<!--
     		<directory>../target/apidocs</directory>
-    		-->
     		<directory>../target</directory>
     		<includes>
     			<include>stratosphere-*-javadoc.jar</include>
     		</includes>
     		<outputDirectory>docs/javadoc</outputDirectory>
     		<fileMode>0644</fileMode>
+		-->
     	</fileSet>
     	
         <fileSet>