2 files changed, 6 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9f1e6db3aebd..5d1c8e092f4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = aspectj
 	pkgdesc = seamless aspect-oriented extension to the Java™ programming language
 	pkgver = 1.9.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://projects.eclipse.org/projects
 	arch = any
 	license = Eclipse Public License 1.0
diff --git a/PKGBUILD b/PKGBUILD
index 365e0aa73880..46c5761d9853 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=aspectj
 pkgver=1.9.5
-pkgrel=1
+pkgrel=2
 pkgdesc='seamless aspect-oriented extension to the Java™ programming language'
 arch=('any')
 url='https://projects.eclipse.org/projects'
@@ -17,6 +17,8 @@ sha256sums=('335820a6772587873dfdcc614a772ecbb4731b4ffb99eb8ad953cde39f9cf825')
 
 package() {
   cd "$srcdir"
-  mkdir -p $pkgdir/usr/lib/jvm/java-11-openjdk
-  java -jar aspectj_$pkgver.jar -to $pkgdir/usr/lib/jvm/java-11-openjdk
+  mkdir -p $pkgdir/opt/aspectj
+  java -jar aspectj_$pkgver.jar -to $pkgdir/opt/aspectj
+  sed -i "s/ ASPECTJ_HOME=.*/ ASPECTJ_HOME=\/opt\/aspectj/" $pkgdir/opt/aspectj/bin/* 
+  sed -i "s/java-10-openjdk/default/" $pkgdir/opt/aspectj/bin/* 
 }