diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index ae8a73584..9ee49893c 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -6,5 +6,5 @@ AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c070
 AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029767d34 SHA1 c1a050bd8ad2444eb6729b8a7f451960711af2df SHA256 dce4897d62d0dc29ab03834ed1d66ede95c07702e32a0042f96c24c6f1213386
-EBUILD subversion-java-1.6.16.ebuild 4320 RMD160 6881edfc7be1111137776e3f6bdec1f92a1787dc SHA1 f9367d41c9b2b30750594b16fa14c6e3e531d29d SHA256 d8749c52070f7c34f0ff9318728ab43b950d83faf8cece94cf8ba6a90f95c17e
+EBUILD subversion-java-1.6.16.ebuild 4296 RMD160 f65b0ad90fd9084d9a5fb3d90ce3760f6646b934 SHA1 87074161847d919de15f9621e7d0f5807ad21388 SHA256 876038a13bbcecaea8cff3111b4c30dc785891f19db91d613eb073ce218c9a82
 MISC metadata.xml 558 RMD160 7c6fecb710b66051ab3a61a5aa50ae51da74e658 SHA1 5722fe19c5fbd79e9579b50e8ba71f952ddd3ea0 SHA256 89cee02e2d381bace416b51fdb26af91061fa0b0a62e9f20512b252461b534a0
diff --git a/dev-vcs/subversion-java/subversion-java-1.6.16.ebuild b/dev-vcs/subversion-java/subversion-java-1.6.16.ebuild
index 3d7d30b71..c66f197ff 100644
--- a/dev-vcs/subversion-java/subversion-java-1.6.16.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.6.16.ebuild
@@ -171,11 +171,11 @@ src_install() {
 	print
 	emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
 	java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so
+	java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib
 	java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
 	rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
 
-	rm -fr "${ED}usr/share/${MY_SVN_PN}" # to be sure mv command below executes properly
-	mv "${ED}usr/share/${PN}" "${ED}usr/share/${MY_SVN_PN}"
+	mv "${ED}usr/share/${PN}/package.env" "${ED}/usr/share/${MY_SVN_PN}/"
 
 	if use doc; then
 		java-pkg_dojavadoc doc/javadoc