diff --git a/dev-java/artifactory/Manifest b/dev-java/artifactory/Manifest
index 5677339..eee58a4 100644
--- a/dev-java/artifactory/Manifest
+++ b/dev-java/artifactory/Manifest
@@ -1,4 +1,4 @@
-AUX artifactory.confd 729 RMD160 810db10baee3161591a850cb5d70926f7f6e3233 SHA1 740581f0324063d11384385d51804e4efe0c9448 SHA256 81df9fa9ca65259199a1a844c45cd7c58e07565ef89369af54e198421a40f69c
-AUX artifactory.initd 1054 RMD160 435d6b3d97905e254ac7714e2621a42cef6c5609 SHA1 38a6308a0e60d464b41f6b2cd94607bf25e52c6e SHA256 c94ddfda9aa088d76269678eba73817092cc2421752440d63d3f1b2ae6bdb845
+AUX artifactory.confd 483 RMD160 4891522cd9ece45cdc5d06efb705e5db9c8b17fa SHA1 214c787f3e4b792ea574a69c990569a732ababc0 SHA256 e654eaf60f0b285e51f6a0f520d29d53a8a056e0144409c4cc16e07fae22c38c
+AUX artifactory.initd 1052 RMD160 b48c9df77b0bd6d5efd07c5f2540dab782c6c52d SHA1 1c544dbbc0e2fc713fc9e76928de32c2c0a1b319 SHA256 5e742419d7224db73eded1a57f44f3dfc2a5e983d5b3f4c8e04cd36b747c40c8
 DIST artifactory-2.4.1.zip 33661456 RMD160 89e99581f1d5c8d824c39f18186220b6d292155b SHA1 3ee96e45697ccd3c7a27f000445c97a08113a3d7 SHA256 b49bb9b1130b37779ad0cf76443454f51c449aa0125fb114800c0cb2548e0187
-EBUILD artifactory-2.4.1.ebuild 2853 RMD160 07c33b2e0706181130d6951c18ffbe69b7a9b9ec SHA1 72803c6d23a5289432cd81c2a2ef8cb0991db297 SHA256 ea3fc1d580ad3ba9c2b75a948a49160a9909bb860be2fa118d9ee8c37c13c112
+EBUILD artifactory-2.4.1.ebuild 3151 RMD160 2a7fecbe7e445843106854a2b51581f87461e8ff SHA1 6e4ace7d2ef5b65e63f41f7aa2df56c5d71c19df SHA256 e3cbc00ea65c3b34df26d4e3340a40add6f48b339a84081febbb0411e3a88e14
diff --git a/dev-java/artifactory/artifactory-2.4.1.ebuild b/dev-java/artifactory/artifactory-2.4.1.ebuild
index 32bfb99..6975b98 100644
--- a/dev-java/artifactory/artifactory-2.4.1.ebuild
+++ b/dev-java/artifactory/artifactory-2.4.1.ebuild
@@ -14,7 +14,10 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-3"
 IUSE="mysql derby postgres"
 
-RDEPEND=">=virtual/jre-1.5"
+RDEPEND=">=virtual/jre-1.5
+	dev-java/jsr305
+	mysql? ( dev-java/jdbc-mysql )
+	"
 DEPEND=">=virtual/jdk-1.5
 	dev-java/jsr305
 	mysql? ( dev-java/jdbc-mysql )
@@ -65,9 +68,14 @@ src_install() {
 	fi
 	if ! use mysql; then
 		rm -r ${S}/etc/repo/*mysql
+	else
+		dosym $(java-config -p jdbc-mysql) ${ARTIFACTORY_INSTALL}/lib/jdbc-mysql.jar
+		dosym $(java-config -p c3p0) ${ARTIFACTORY_INSTALL}/lib/c3p0.jar
 	fi
 	if ! use postgres; then
 		rm -r ${S}/etc/repo/*postgresql
+	else
+		dosym $(java-config -p jdbc-postgresql) ${ARTIFACTORY_INSTALL}/lib/jdbc-postgresql.jar
 	fi
 
 	chown ${ARTIFACTORY_USER}:artifact ${S}/etc/repo
diff --git a/dev-java/artifactory/files/artifactory.confd b/dev-java/artifactory/files/artifactory.confd
index 9921d84..531d9ed 100644
--- a/dev-java/artifactory/files/artifactory.confd
+++ b/dev-java/artifactory/files/artifactory.confd
@@ -6,14 +6,8 @@ ARTIFACTORY_PORT="8081"
 ARTIFACTORY_HOME="/var/lib/artifactory"
 ARTIFACTORY_INSTALL="/usr/share/artifactory"
 
-# Options for artifacory
-ARTIFACTORY_OPTS=""
-
 # JSR 305 support for non sun/oracle VMs
-JDBC_JAR="/usr/share/jsr305/lib/jsr305.jar"
-# adding JDBC to the classpath choose the needed.
-#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-mysql/lib/jdbc-mysql.jar"
-#JDBC_JAR="${JDBC_JAR}:/usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar"
+JSR305="$(java-config -p jsr305)"
 
 # User and group as which to run artifactory
 #ARTIFACTORY_USER="artifact"
diff --git a/dev-java/artifactory/files/artifactory.initd b/dev-java/artifactory/files/artifactory.initd
index 5282869..5bd4566 100644
--- a/dev-java/artifactory/files/artifactory.initd
+++ b/dev-java/artifactory/files/artifactory.initd
@@ -18,7 +18,7 @@ start() {
 	do
 	    CLASSPATH="$CLASSPATH:$i"
 	done
-	CLASSPATH="$CLASSPATH:$JDBC_JAR"
+	CLASSPATH="$CLASSPATH:$JSR305"
 
 	start-stop-daemon --start --user ${ARTIFACTORY_USER:-artifact}:${ARTIFACTORY_GROUP:-artifact} \
 	        --chdir "/var/lib/artifactory" \