Index: /CKEditor.Java/ckeditor-java-core/trunk/pom.xml
===================================================================
--- /CKEditor.Java/ckeditor-java-core/trunk/pom.xml	(revision 6846)
+++ /CKEditor.Java/ckeditor-java-core/trunk/pom.xml	(revision 6847)
@@ -71,4 +71,12 @@
 					<detectOfflineLinks>false</detectOfflineLinks>
 					<encoding>UTF-8</encoding>
+					<archive>
+						<manifestEntries>
+							<Built-By>${project.organization.name}</Built-By>
+						</manifestEntries>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
 				</configuration>
 				<executions>
@@ -85,4 +93,14 @@
 				<artifactId>maven-source-plugin</artifactId>
 				<version>2.1.2</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Built-By>${project.organization.name}</Built-By>
+						</manifestEntries>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+					</archive>
+				</configuration>
 				<executions>
 					<execution>
@@ -101,10 +119,9 @@
 					<archive>
 						<addMavenDescriptor>false</addMavenDescriptor>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
 						<manifestEntries>
-							<Implementation-Title>CKEditor for Java - Core</Implementation-Title>
-							<Implementation-Version>2.0</Implementation-Version>
-							<Implementation-Vendor-Id>com.ckeditor</Implementation-Vendor-Id>
-							<Implementation-URL>http://ckeditor.com</Implementation-URL>
-							<Built-By>CKSource - Frederico Knabben</Built-By>
+							<Built-By>${project.organization.name}</Built-By>
 						</manifestEntries>
 					</archive>
Index: /CKEditor.Java/ckeditor-java/trunk/pom.xml
===================================================================
--- /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6846)
+++ /CKEditor.Java/ckeditor-java/trunk/pom.xml	(revision 6847)
@@ -86,12 +86,11 @@
 				<configuration>
 					<archive>
+						<manifestEntries>
+							<Built-By>${project.organization.name}</Built-By>
+						</manifestEntries>
+						<manifest>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
 						<addMavenDescriptor>false</addMavenDescriptor>
-						<manifestEntries>
-							<Implementation-Title>CKEditor for Java</Implementation-Title>
-							<Implementation-Version>2.0</Implementation-Version>
-							<Implementation-Vendor-Id>com.ckeditor</Implementation-Vendor-Id>
-							<Implementation-URL>http://ckeditor.com</Implementation-URL>
-							<Built-By>CKSource - Frederico Knabben</Built-By>
-						</manifestEntries>
 					</archive>
 				</configuration>