diff --git a/ca-certificates-java/PKGBUILD b/ca-certificates-java/PKGBUILD
index 333032da3..d13945cd4 100644
--- a/ca-certificates-java/PKGBUILD
+++ b/ca-certificates-java/PKGBUILD
@@ -4,37 +4,35 @@
 # maintainer: Samir Benmendil <ram-z[at]chakra-project[dot]org>
 
 pkgname=ca-certificates-java
-pkgver=20130815
+pkgver=20140324
 pkgrel=1
 pkgdesc='Common CA certificates (JKS keystore)'
 arch=('any')
 url='http://packages.qa.debian.org/c/ca-certificates-java.html'
 license=('GPL')
 depends=('ca-certificates')
-makedepends=('openjdk')
+makedepends=('maven')
 checkdepends=('junit')
 install='ca-certificates-java.install'
 backup=('etc/default/cacerts')
-source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.gz"
+source=("http://ftp.debian.org/debian/pool/main/c/${pkgname}/${pkgname}_${pkgver}.tar.xz"
         'init-jks-keystore' 'jks-keystore.hook')
-md5sums=('f93e4762800515d6f12ceb397e80a150'
-         '75eeca3f443f4b5a17ed5ac81875f1e9'
-         '6dd4f915aee0df51260083e00b7fa012')
+md5sums=('18d945321d2cc391124d1c5f18617814'
+         '711212885d25fca96ad6689af5d7ec2a'
+         '0beeef887fbab98e7d1d40ec0cd455dd')
+
+prepare() {
+	mkdir "${srcdir}/m2_repo"
+}
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-	javac -target 1.6 -source 1.6 UpdateCertificates.java
-	jar cfe ca-certificates-java.jar UpdateCertificates *.class
+	mvn package -Dmaven.repo.local="${srcdir}/m2_repo" -Dmaven.test.skip=true
 }
 
 check() {
 	cd ${srcdir}/${pkgname}-${pkgver}
-
-	javac -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar \
-		UpdateCertificatesTest.java Exceptions.java
-	java -cp /usr/share/java/junit.jar:/usr/share/ca-certificates-java/ca-certificates-java.jar:. \
-		org.junit.runner.JUnitCore \
-		UpdateCertificatesTest
+	mvn -Dmaven.repo.local="${srcdir}/m2_repo" test
 }
 
 package() {
@@ -42,7 +40,7 @@ package() {
 
 	install -d -m755 ${pkgdir}/etc/ssl/certs/java
 	install -D -m600 debian/default ${pkgdir}/etc/default/cacerts
-	install -D -m644 ca-certificates-java.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
-	install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/sbin/init-jks-keystore
+	install -D -m644 target/ca-certificates-java-${pkgver}.jar ${pkgdir}/usr/share/ca-certificates-java/ca-certificates-java.jar
+	install -D -m755 ${srcdir}/init-jks-keystore ${pkgdir}/usr/bin/init-jks-keystore
 	install -D -m755 ${srcdir}/jks-keystore.hook ${pkgdir}/etc/ca-certificates/update.d/jks-keystore
 }
diff --git a/ca-certificates-java/ca-certificates-java.install b/ca-certificates-java/ca-certificates-java.install
index f5ce35eb9..0b9a98751 100644
--- a/ca-certificates-java/ca-certificates-java.install
+++ b/ca-certificates-java/ca-certificates-java.install
@@ -1,15 +1,12 @@
 post_install() {
 	if [ ! -f etc/ssl/certs/java/cacerts ]; then
 		if which java >/dev/null 2>&1; then
-			usr/sbin/init-jks-keystore
+			usr/bin/init-jks-keystore
 		fi
 	fi
 }
 
 post_upgrade() {
-	if [ $(vercmp $2 20110426-2) -lt 0 ]; then
-		mv etc/ssl/certs/java/cacerts etc/ssl/certs/java/cacerts.pacsave
-	fi
 	post_install
 }
 
diff --git a/ca-certificates-java/init-jks-keystore b/ca-certificates-java/init-jks-keystore
old mode 100755
new mode 100644
index 0758420df..e38cee306
--- a/ca-certificates-java/init-jks-keystore
+++ b/ca-certificates-java/init-jks-keystore
@@ -6,5 +6,8 @@ storepass='changeit'
 JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
 find /etc/ssl/certs -name '*.pem' -printf "+%p\n" | \
-	java -jar $JAR -storepass "$storepass" >/dev/null
-echo "done."
+  java -Xmx64m -cp $JAR org.debian.security.UpdateCertificates -storepass "$storepass" >/dev/null
+
+if [ $? -eq 0 ]; then
+  echo "done."
+fi
diff --git a/ca-certificates-java/jks-keystore.hook b/ca-certificates-java/jks-keystore.hook
index 67d9eda0b..c61d2d97b 100644
--- a/ca-certificates-java/jks-keystore.hook
+++ b/ca-certificates-java/jks-keystore.hook
@@ -11,5 +11,5 @@ fi
 
 JAR=/usr/share/ca-certificates-java/ca-certificates-java.jar
 
-java -jar $JAR -storepass "$storepass"
+java -Xmx64m -jar $JAR -storepass "$storepass"
 echo "done."