diff --git a/app-text/pdfsam/ChangeLog b/app-text/pdfsam/ChangeLog
index f7b1371d..3bda3bf6 100644
--- a/app-text/pdfsam/ChangeLog
+++ b/app-text/pdfsam/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Apr 2009; Mario Fetka <mario.fetka@gmail.com> pdfsam-1.5.1e.ebuild:
+  sunrise sugested cleanup
+
   28 Jan 2009; Mario Fetka <mario.fetka@gmail.com> +pdfsam-1.5.1e.ebuild:
   Bump
 
diff --git a/app-text/pdfsam/Manifest b/app-text/pdfsam/Manifest
index 7bb9085b..0b9ea6d2 100644
--- a/app-text/pdfsam/Manifest
+++ b/app-text/pdfsam/Manifest
@@ -12,6 +12,6 @@ EBUILD pdfsam-1.4.1e.ebuild 4601 RMD160 11512062d8c55f13706ce966ac72ee522a726fce
 EBUILD pdfsam-1.4.2e.ebuild 4601 RMD160 11512062d8c55f13706ce966ac72ee522a726fce SHA1 23ae56cf251970545f1f061b8ba89ca1549bfa8b SHA256 1f0a294148607dc729a0481c88412bfffb585644be251f8dcf5aff9ce5dffebc
 EBUILD pdfsam-1.4.3e.ebuild 4601 RMD160 11512062d8c55f13706ce966ac72ee522a726fce SHA1 23ae56cf251970545f1f061b8ba89ca1549bfa8b SHA256 1f0a294148607dc729a0481c88412bfffb585644be251f8dcf5aff9ce5dffebc
 EBUILD pdfsam-1.5.0e.ebuild 4854 RMD160 da081ffa153648985121dcc09bd6c19c2fd5c0ba SHA1 541c215a28b97bdbced8f0121315f8dd462a2c0b SHA256 0980773c56b37a4bbaf1a845f63e00a4032a1db6eae182f00313b039adfe623a
-EBUILD pdfsam-1.5.1e.ebuild 4854 RMD160 da081ffa153648985121dcc09bd6c19c2fd5c0ba SHA1 541c215a28b97bdbced8f0121315f8dd462a2c0b SHA256 0980773c56b37a4bbaf1a845f63e00a4032a1db6eae182f00313b039adfe623a
-MISC ChangeLog 2023 RMD160 5784d33f706b6d5e1260b15366536f22260eed15 SHA1 8b1ad474ae724c0936ad22f8887ed0f3cdb0df1c SHA256 db31c95f312af48dd2bc30e18df238b3c660aba72214990caf09324efc64a77c
+EBUILD pdfsam-1.5.1e.ebuild 4798 RMD160 34f88d05194483218001385f09c37e95c05039ec SHA1 86cfa5b9fbbf8af8baa46951f3a75e2e24e1b25d SHA256 6f4e1e6a3321cdddf28f383a393c85ed69d67ba7eb45a733041f51299d289a02
+MISC ChangeLog 2124 RMD160 3abe456ccf096c05d41faddd49186a9fe214e348 SHA1 a8f859f7a3cb437997eab4c5c1a4bc04cd33f0ec SHA256 81bb88393a536366a1dc8cb94478b760b2ab8ba2a04447663864a191f050a54c
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/app-text/pdfsam/pdfsam-1.5.1e.ebuild b/app-text/pdfsam/pdfsam-1.5.1e.ebuild
index 57c6b7ec..36e71195 100644
--- a/app-text/pdfsam/pdfsam-1.5.1e.ebuild
+++ b/app-text/pdfsam/pdfsam-1.5.1e.ebuild
@@ -88,27 +88,27 @@ src_compile() {
 
 src_install() {
 	insinto /usr/share/${PN}-${SLOT}/lib
-	doins "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/*.xml
-	java-pkg_dojar "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/pdfsam.jar
-	java-pkg_dojar "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/lib/pdfsam-*.jar
-	java-pkg_dojar "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/lib/emp4j.jar
+	doins build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/*.xml
+	java-pkg_dojar build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/pdfsam.jar
+	java-pkg_dojar build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/lib/pdfsam-*.jar
+	java-pkg_dojar build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/lib/emp4j.jar
 
 	for plugins in decrypt encrypt merge unpack split setviewer cover mix
 	do
 	    java-pkg_jarinto /usr/share/${PN}-${SLOT}/lib/plugins/${plugins}
 	    insinto /usr/share/${PN}-${SLOT}/lib/plugins/${plugins}
 
-	    java-pkg_dojar "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/plugins/${plugins}/*.jar
-	    doins "${S}"/build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/plugins/${plugins}/*.xml
+	    java-pkg_dojar build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/plugins/${plugins}/*.jar
+	    doins build/pdfsam-maine-br1/release/dist/pdfsam-enhanced/plugins/${plugins}/*.xml
 	done
 
 	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-br1/images/pdf.png pdfsam-${SLOT}.png
+	newicon pdfsam-maine-br1/images/pdf.png pdfsam-${SLOT}.png
 	make_desktop_entry ${PN} "PDF Split and Merge ${PV}" pdfsam-${SLOT}.png Office
 
 	use doc && dodoc pdfsam-maine-br1/doc/enhanced/*
 
-	use doc && java-pkg_dojavadoc "${S}"/build/pdfsam-maine-br1/apidocs
+	use doc && java-pkg_dojavadoc build/pdfsam-maine-br1/apidocs
 }