Index: /FCKeditor.Java/branches/2.4/pom.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/pom.xml	(revision 1322)
+++ /FCKeditor.Java/branches/2.4/pom.xml	(revision 1323)
@@ -39,30 +39,30 @@
 			<scope>test</scope>
 		</dependency>
-	    <!-- the slf4j commons-logging replacement -->
-	    <dependency>
-	        <groupId>org.slf4j</groupId>
-	        <artifactId>jcl104-over-slf4j</artifactId>
-	        <version>1.4.2</version>
-	    </dependency>
-	    <!-- the other slf4j jars -->
-	    <dependency>
-	        <groupId>org.slf4j</groupId>
-	        <artifactId>slf4j-api</artifactId>
-	        <version>1.4.3</version>
-	    </dependency>
-	    <!-- using log4j as backend -->
-	    <dependency>
-	        <groupId>org.slf4j</groupId>
-	        <artifactId>slf4j-log4j12</artifactId>
-	        <version>1.4.3</version>
-	    </dependency>
-	    <dependency>
-	        <groupId>log4j</groupId>
-	        <artifactId>log4j</artifactId>
-	        <version>1.2.14</version>
-	    </dependency>
+		<!-- the slf4j commons-logging replacement -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl104-over-slf4j</artifactId>
+			<version>1.4.2</version>
+		</dependency>
+		<!-- the other slf4j jars -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.4.3</version>
+		</dependency>
+		<!-- using log4j as backend -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>1.4.3</version>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+		</dependency>
 	</dependencies>
 	<build>
-		<finalName>FCKeditor-${pom.version}</finalName>
+		<finalName>FCKeditor-${project.version}</finalName>
 		<plugins>
 			<plugin>
@@ -77,6 +77,20 @@
 				</configuration>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>
+							src/main/assembly/src.xml
+						</descriptor>
+						<descriptor>
+							src/main/assembly/bin.xml
+						</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+	<!-- commented out for now since it produces errors
 	<reporting>
 		<plugins>
@@ -85,6 +99,10 @@
 				<artifactId>maven-taglib-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</reporting>
+	 -->
 	<name>FCKeditor - Java Connector</name>
 	<description>
@@ -99,5 +117,5 @@
 		<license>
 			<name>GPL, LGPL, MPL</name>
-			<url>license.txt</url>
+			<url>LICENSE.txt</url>
 		</license>
 	</licenses>
Index: /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml	(revision 1323)
+++ /FCKeditor.Java/branches/2.4/src/main/assembly/bin.xml	(revision 1323)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+	<id>bin</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeSiteDirectory>true</includeSiteDirectory>
+	<fileSets>
+		<fileSet>
+			<includes>
+				<include>README*</include>
+				<include>LICENSE*</include>
+				<include>NOTICE*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+	<files>
+		<file>
+			<!-- should be actually ${project.build.finalName} -->
+			<source>target/FCKeditor-${project.version}.jar</source>
+		</file>
+	</files>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>lib</outputDirectory>
+		</dependencySet>
+	</dependencySets>
+</assembly>
Index: /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml	(revision 1323)
+++ /FCKeditor.Java/branches/2.4/src/main/assembly/src.xml	(revision 1323)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>
+</assembly>