diff --git a/.SRCINFO b/.SRCINFO
index a881bbb9bb65412c7820540f216b348784bde5da..1de0739e2e5a7e74307eda00c4178107239fe9cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = aparapi
-	pkgdesc = Syncleus's GPGPU API for data parallel Java. Uses OpenCL.
+	pkgdesc = Syncleus's GPGPU API for data parallel Java using OpenCL.
 	pkgver = 1.0.0
 	pkgrel = 2
 	url = https://github.com/Syncleus/aparapi-jni
 	install = aparapi.install
 	arch = i686
 	arch = x86_64
-	groups = amdapp
 	license = Apache
 	makedepends = gzip
 	depends = java-environment
@@ -14,8 +13,8 @@ pkgbase = aparapi
 	source = aparapi.sh
 	source = aparapi.conf
 	source = https://github.com/Syncleus/aparapi-jni/releases/download/v1.0.0/libaparapi-1.0.0-linux.tar.gz
-	md5sums = 94bfab19f10cde995aecd15ff42487a7
-	md5sums = a7e04cc30d00498ff733af771b721dca
+	md5sums = 39b6041f8009694d208795cbfcff164e
+	md5sums = d17068edb75da65a7ef620cbd1c876d4
 	md5sums = cc28497f3befd355e4636c333ac6b9ab
 
 pkgname = aparapi
diff --git a/PKGBUILD b/PKGBUILD
index 31bde3981797056590e481bfc888e0df40d09b19..b40c8016d73b7f75a0c0bd982f10b8ef83891b75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,27 +3,26 @@
 pkgname=aparapi
 pkgver=1.0.0
 pkgrel=2
-pkgdesc="Syncleus's GPGPU API for data parallel Java. Uses OpenCL."
+pkgdesc="Syncleus's GPGPU API for data parallel Java using OpenCL."
 url="https://github.com/Syncleus/aparapi-jni"
 arch=('i686' 'x86_64')
 license=('Apache')
-groups=('amdapp')
 depends=('java-environment')
 makedepends=('gzip')
 provides=('aparapi')
 install='aparapi.install'
 
 source=( 'aparapi.sh')
-md5sums=('94bfab19f10cde995aecd15ff42487a7')
+md5sums=('39b6041f8009694d208795cbfcff164e')
 
 source+=( 'aparapi.conf')
-md5sums+=('a7e04cc30d00498ff733af771b721dca')
+md5sums+=('d17068edb75da65a7ef620cbd1c876d4')
 
 source+=(https://github.com/Syncleus/aparapi-jni/releases/download/v${pkgver}/libaparapi-${pkgver}-linux.tar.gz)
 md5sums+=('cc28497f3befd355e4636c333ac6b9ab')
 
 package() {
-	mkdir -p "$pkgdir"/{opt/AMDAPP/aparapi/lib,etc/profile.d,etc/ld.so.conf.d}
+	mkdir -p "$pkgdir"/{opt/aparapi/lib,etc/profile.d,etc/ld.so.conf.d}
 	cd ${srcdir}
 	install -m755 aparapi.sh "$pkgdir/etc/profile.d/"
 	cd ${srcdir}
@@ -31,8 +30,8 @@ package() {
 
       cd libaparapi-${pkgver}
       if [ "${CARCH}" = "i686" ]; then
-	install -m755 libaparapi_x86.so "$pkgdir/opt/AMDAPP/aparapi/lib"
+	install -m755 libaparapi_x86.so "$pkgdir/opt/aparapi/lib"
       elif [ "${CARCH}" = "x86_64" ]; then
-	install -m755 libaparapi_x86_64.so "$pkgdir/opt/AMDAPP/aparapi/lib"
+	install -m755 libaparapi_x86_64.so "$pkgdir/opt/aparapi/lib"
       fi
 } 
diff --git a/aparapi.conf b/aparapi.conf
index 0ea3664a81ee6dc9f3e9835b27ef90f48952f35f..6d523c628571319ffccb647a18f7571695629922 100644
--- a/aparapi.conf
+++ b/aparapi.conf
@@ -1 +1 @@
-/opt/AMDAPP/aparapi/lib
+/opt/aparapi/lib
diff --git a/aparapi.sh b/aparapi.sh
index 2698c8f9902dd0ddfe137d001327595d1e502387..0fe77a14c3ce8c98c8aa42a8807d2f19b5987733 100755
--- a/aparapi.sh
+++ b/aparapi.sh
@@ -1,2 +1,2 @@
-export LIBAPARAPI=/opt/AMDAPP/aparapi/lib
-export LD_LIBRARY_PATH=/opt/AMDAPP/aparapi/lib:$LD_LIBRARY_PATH
+export LIBAPARAPI=/opt/aparapi/lib
+export LD_LIBRARY_PATH=/opt/aparapi/lib:$LD_LIBRARY_PATH