diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 71edf7b1e..b3e158b2b 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=classpath
 pkgver=0.99
-pkgrel=2
+pkgrel=3
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/classpath/"
@@ -25,6 +25,17 @@ 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
@@ -41,6 +52,33 @@ 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/man/man1/gjdoc.1*
   rm -f $pkgdir/usr/share/info/dir
 }