diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 2acca8042..71edf7b1e 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=classpath
 pkgver=0.99
-pkgrel=1
+pkgrel=2
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/classpath/"
@@ -16,7 +16,8 @@ license=('GPL')
 depends=('gtk2>=2.8' 'libxtst' 'libsm' 'freetype2')
 makedepends=('gtk2>=2.8' 'libxtst' 'gconf' 'java-environment' 'antlr2')
 optdepends=('file' 'gconf')
-source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz freetype2_include.patch
+source=(ftp://ftp.gnu.org/gnu/classpath/$pkgname-$pkgver.tar.gz
+       freetype2_include.patch
         aarch64.patch)
 md5sums=('0ae1571249172acd82488724a3b8acb4'
          '55dafc301c5f2e497696d01e9c1dab9c'
@@ -24,17 +25,6 @@ md5sums=('0ae1571249172acd82488724a3b8acb4'
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
-
-  patch -p0 Makefile.in <<EOF
-298,299c298,299
-< SUBDIRS = lib doc external include native resource scripts \$(TOOLSDIR) \$(EXAMPLESDIR)
-< DIST_SUBDIRS = lib doc external include native resource scripts tools examples
----
-> SUBDIRS = lib doc external include native resource scripts
-> DIST_SUBDIRS = lib doc external include native resource scripts
-EOF
-
-  # fix freetype2 include path 
   patch -Np1 -i $srcdir/freetype2_include.patch
 
   # add AArch64 support
@@ -51,32 +41,6 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make EXAMPLESDIR= DESTDIR=$pkgdir install
-
-  rm -f $pkgdir/usr/bin/gappletviewer
-  rm -f $pkgdir/usr/bin/gjar
-  rm -f $pkgdir/usr/bin/gjarsigner
-  rm -f $pkgdir/usr/bin/gjavah
-  rm -f $pkgdir/usr/bin/gkeytool
-  rm -f $pkgdir/usr/bin/gnative2ascii
-  rm -f $pkgdir/usr/bin/gorbd
-  rm -f $pkgdir/usr/bin/grmic
-  rm -f $pkgdir/usr/bin/grmid
-  rm -f $pkgdir/usr/bin/grmiregistry
-  rm -f $pkgdir/usr/bin/gserialver
-  rm -f $pkgdir/usr/bin/gtnameserv
   rm -f $pkgdir/usr/lib/logging.properties
-  rm -f $pkgdir/usr/lib/security/classpath.security
-  rm -f $pkgdir/usr/share/man/man1/gappletviewer.1*
-  rm -f $pkgdir/usr/share/man/man1/gcjh.1*
-  rm -f $pkgdir/usr/share/man/man1/gjar.1*
-  rm -f $pkgdir/usr/share/man/man1/gjarsigner.1*
-  rm -f $pkgdir/usr/share/man/man1/gjavah.1*
-  rm -f $pkgdir/usr/share/man/man1/gkeytool.1*
-  rm -f $pkgdir/usr/share/man/man1/gnative2ascii.1*
-  rm -f $pkgdir/usr/share/man/man1/gorbd.1*
-  rm -f $pkgdir/usr/share/man/man1/grmid.1*
-  rm -f $pkgdir/usr/share/man/man1/grmiregistry.1*
-  rm -f $pkgdir/usr/share/man/man1/gserialver.1*
-  rm -f $pkgdir/usr/share/man/man1/gtnameserv.1*
   rm -f $pkgdir/usr/share/info/dir
 }