diff --git a/pom.xml b/pom.xml
index 271dbacd..3686d06a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,6 +68,30 @@
 				</configuration>
 			</plugin>		
 	
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+        	<aggregate>true</aggregate>
+					<links>
+						<link>
+							http://java.sun.com/j2se/1.5.0/docs/api
+						</link>
+					</links>
+          <groups>
+            <group>
+              <title>SLF4J packages</title>
+              <packages>org.slf4j.*</packages>
+            </group>
+            <group>
+              <title>Jakarta Commons Logging packages</title>
+              <packages>org.apache.commons.*</packages>
+            </group>
+          </groups>
+        </configuration>
+      </plugin>
+
     </plugins>
 
 	</build>
@@ -79,31 +103,14 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>
-					maven-project-info-reports-plugin
-				</artifactId>
+				<artifactId>maven-project-info-reports-plugin</artifactId>
 				<reportSets>
-					<reportSet>
-						<reports>
-						</reports>
-					</reportSet>
+					<reportSet><reports></reports></reportSet>
 				</reportSets>
-			</plugin>
-	 
-      <plugin>
-      	<groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-        	<aggregate>true</aggregate>
-					<links>
-						<link>
-							http://java.sun.com/j2se/1.5.0/docs/api
-						</link>
-					</links>
-				</configuration>
-      </plugin>
+			</plugin>	    
       
       <plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -114,9 +121,7 @@
 							src/main/assembly/source.xml
 						</descriptor>
 					</descriptors>
-					<finalName>
-						logback-${project.version}
-					</finalName>
+					<finalName>slf4j-${project.version}</finalName>
 					<appendAssemblyId>false</appendAssemblyId>
 					<outputDirectory>target/site/dist/</outputDirectory>
 				</configuration>
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
new file mode 100644
index 00000000..b780ab0f
--- /dev/null
+++ b/src/main/assembly/source.xml
@@ -0,0 +1,82 @@
+<assembly>
+	<id>dist</id>
+	<formats>
+		<format>zip</format>
+		<format>tar.gz</format>
+	</formats>
+	<fileSets>
+    <!-- Module POMs -->
+    <fileSet>
+      <directory>slf4j-api/</directory>
+      <outputDirectory>slf4j-api/</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+
+    <fileSet>
+      <directory>slf4j-jcl/</directory>
+      <outputDirectory>slf4j-jcl/</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+
+
+
+    <fileSet>
+      <directory>slf4j-jdk14/</directory>
+      <outputDirectory>slf4j-jdk14/</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+
+		
+		<!-- Module Source directories -->
+		<fileSet>
+			<directory>slf4j-api/src/</directory>
+			<outputDirectory>slf4j-api/src/</outputDirectory>
+      <excludes>
+        <exclude>
+          test/output/
+        </exclude>
+      </excludes>
+    </fileSet>
+		
+		<!-- Module JARs -->
+		<fileSet>
+			<directory>slf4j-api/target/</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>slf4j-api-${project.version}.jar</include>
+			</includes>
+		</fileSet>
+
+		<!-- Module Source JARs -->
+		<fileSet>
+			<directory>slf4j-api/target/</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>slf4j-api-${project.version}-sources.jar</include>
+			</includes>
+		</fileSet>
+		
+		<!-- Website -->
+		<fileSet>
+			<directory>target/site</directory>
+			<outputDirectory>/site</outputDirectory>
+		</fileSet>
+		
+		<!-- Parent files -->
+		<fileSet>
+			<includes>
+				<include>src/</include>
+				<include>README*</include>
+				<include>LICENSE*</include>
+				<include>pom.xml</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	
+</assembly>
\ No newline at end of file