diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index e92a172f5c..ada876a8fc 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -78,7 +78,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
   cp -P $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
-  cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/libzip-[0-9]*/lib/.libs/libzip*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
diff --git a/packages/audio/pulseaudio/meta b/packages/audio/pulseaudio/meta
index 2d6efe578a..95586f253b 100644
--- a/packages/audio/pulseaudio/meta
+++ b/packages/audio/pulseaudio/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pulseaudio.org/"
 PKG_URL="http://freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
+PKG_DEPENDS="libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl"
 PKG_BUILD_DEPENDS="toolchain libtool json-c alsa-lib libsndfile libsamplerate speex dbus systemd openssl libcap"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
diff --git a/packages/devel/libcap/build b/packages/devel/libcap/build
index 66409f735c..1c6e323b84 100755
--- a/packages/devel/libcap/build
+++ b/packages/devel/libcap/build
@@ -33,6 +33,11 @@ make CC=$HOST_CC -C libcap _makenames
 
 setup_toolchain target
 
-make CC=$TARGET_CC CFLAGS="$TARGET_CFLAGS" lib=/lib
+make CC=$TARGET_CC CFLAGS="$TARGET_CFLAGS" lib=/lib -C libcap libcap.a
+
+mkdir -p $SYSROOT_PREFIX/usr/lib
+  cp libcap/libcap.a $SYSROOT_PREFIX/usr/lib
+
+mkdir -p $SYSROOT_PREFIX/usr/include/sys
+  cp libcap/include/sys/capability.h $SYSROOT_PREFIX/usr/include/sys
 
-$MAKEINSTALL -j1 RAISE_SETFCAP=no lib=/lib
diff --git a/packages/devel/libcap/install b/packages/devel/libcap/install
deleted file mode 100755
index a751557b92..0000000000
--- a/packages/devel/libcap/install
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libcap/*.so* $INSTALL/usr/lib
diff --git a/packages/sysutils/systemd/meta b/packages/sysutils/systemd/meta
index 607855565f..48ef12b434 100644
--- a/packages/sysutils/systemd/meta
+++ b/packages/sysutils/systemd/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
 PKG_URL="http://www.freedesktop.org/software/systemd/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="libcap dbus kmod util-linux glib libgcrypt"
+PKG_DEPENDS="dbus kmod util-linux glib libgcrypt"
 PKG_BUILD_DEPENDS="toolchain attr libcap dbus kmod util-linux glib libgcrypt"
 PKG_PRIORITY="required"
 PKG_SECTION="system"