diff --git a/app-text/pdfsam/ChangeLog b/app-text/pdfsam/ChangeLog
index 65d4d787..0a00752f 100644
--- a/app-text/pdfsam/ChangeLog
+++ b/app-text/pdfsam/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  31 Jul 2008; Mario Fetka <mario.fetka@gmail.com> pdfsam-1.4.0e.ebuild:
+  Finish javadoc
+
   31 Jul 2008; Mario Fetka <mario.fetka@gmail.com> pdfsam-1.4.0e.ebuild:
   enable javadoc
 
diff --git a/app-text/pdfsam/Manifest b/app-text/pdfsam/Manifest
index 474fcb83..f04bc1dc 100644
--- a/app-text/pdfsam/Manifest
+++ b/app-text/pdfsam/Manifest
@@ -2,6 +2,6 @@ DIST pdfsam-1.3.0e-sr1-build-1-src.zip 568873 RMD160 d41ec9897a986acec7e58336d2e
 DIST pdfsam-1.3.0e-sr1-out-src.zip 391942 RMD160 3c04a901323e81d8fbbca073c7016f70ec29e901 SHA1 5f8e96a275de75287a54dd02d269eefe46a29f4d SHA256 ec4b00985a0cf8e31d5f4ac5bf4e734c43808ede8f55506610354f710d3a7df7
 DIST pdfsam-1.4.0e-out-src.zip 7415336 RMD160 4859f42e96b2df3c226a60f9b01e5ebde8026138 SHA1 e06e9513fbb1233d92151c4e90bd02da4735fa42 SHA256 8e24328f0cc7019120c49e82e4a9239bc4579d0eef8fd707d952a47466b12fa7
 EBUILD pdfsam-1.3.0e_p1.ebuild 2774 RMD160 896e05bf40d094481e6d8d69ab5730ad42efb235 SHA1 0f3d87a29fab07609978d8633e0e44bd299f593f SHA256 86ad36fc5e1193265b2132cb9d3ab46782110bcbca105609ddc51b1e64ebf7d7
-EBUILD pdfsam-1.4.0e.ebuild 4712 RMD160 b60d1f7bb9792617d980d03bbe33051f66d74a4e SHA1 ed5cf4cc8cfd38b7dc1bb81b25d6cafeed429b6c SHA256 997b3fd50a79e53b8e3c43107efc9a8541f5f7cff2d1d05cc59ff2448d97467e
-MISC ChangeLog 1177 RMD160 48b41ed175f5f6005f54e61b66e12f240332db62 SHA1 8250d682399cd34d05cbbac7141c4da64b555965 SHA256 453da30958c2010c68c0e04cbb4f33b8e90ab2069e51c3536d47496826eb8a7e
+EBUILD pdfsam-1.4.0e.ebuild 4531 RMD160 4ad6247751817d796588de7f4dedc6d00cf8972f SHA1 67824654dae1fbe8e282884ea316f66b4caa4e71 SHA256 b1935805ab9fa7589d092e587df4d6b0f76e2473f44f7b4ace0b56d20a0f4164
+MISC ChangeLog 1268 RMD160 a9768fb1bc836895e35b06eb0571699813d25b60 SHA1 b6311bb18cee0f47eb0d8d003059817667fd9e42 SHA256 1b742f8deabf2a937272283045a74b0ab93dd5654a868f23e3aea69b2493fe9a
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-text/pdfsam/pdfsam-1.4.0e.ebuild b/app-text/pdfsam/pdfsam-1.4.0e.ebuild
index f37e220c..4cdd6344 100644
--- a/app-text/pdfsam/pdfsam-1.4.0e.ebuild
+++ b/app-text/pdfsam/pdfsam-1.4.0e.ebuild
@@ -79,10 +79,7 @@ src_unpack() {
 src_compile() {
 	eant ${antflags} -buildfile pdfsam-maine/ant/build.xml
 
-	use doc && for plugins in merge cover split encrypt mix console maine
-	do
-	    eant ${antflags} -buildfile pdfsam-${plugins}/ant/build.xml javadoc
-	done
+	use doc && eant ${antflags} -buildfile pdfsam-maine/ant/build.xml javadoc
 }
 
 src_install() {
@@ -104,13 +101,10 @@ src_install() {
 	java-pkg_dolauncher ${PN}-${SLOT} --main org.pdfsam.guiclient.GuiClient --pwd "/usr/share/${PN}-${SLOT}/lib"
 	java-pkg_dolauncher ${PN}-console-${SLOT} --main org.pdfsam.console.ConsoleClient --pwd "/usr/share/${PN}-${SLOT}/lib"
 
-        newicon "${S}"/pdfsam-maine/images/pdf.png pdfsam-${SLOT}.png
-        make_desktop_entry ${PN}-${SLOT} "PDF Split and Merge ${PV}" pdfsam-${SLOT}.png Office
+	newicon "${S}"/pdfsam-maine/images/pdf.png pdfsam-${SLOT}.png
+	make_desktop_entry ${PN}-${SLOT} "PDF Split and Merge ${PV}" pdfsam-${SLOT}.png Office
 
-	use doc && dodoc pdfsam-maine/doc/enhanced/* || die
+	use doc && dodoc pdfsam-maine/doc/enhanced/*
 
-	use doc && for plugins in merge cover split encrypt mix console maine
-	do
-	    java-pkg_dojavadoc "${S}"/build/pdfsam-${plugins}/apidocs/*
-	done
+	use doc && java-pkg_dojavadoc "${S}"/build/pdfsam-maine/apidocs
 }