diff --git a/common/shlibs b/common/shlibs
index 6659d7c23d0..ac4d27b136e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1436,3 +1436,5 @@ libtsm.so.3 libtsm-3_1
 libxine.so.2 libxine-1.2.4_1
 libjbig2dec.so.0 libjbig2dec-0.11_1
 libsource-highlight.so.4 libsource-highlight-3.1.7_1
+libvlc.so.5 libvlc-2.1.1_2
+libvlccore.so.7 libvlc-2.1.1_2
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 44e43136b38..2012ab93a98 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=2.1.1
-revision=1
+revision=2
 wrksrc="vlc-${version/a/}"
 build_style=gnu-configure
 configure_args="--disable-gme --disable-libtar --enable-jack
@@ -41,16 +41,13 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel
 pre_configure() {
 	# hostname -s is not valid, at least in coreutils!
 	sed -i "s|hostname -s|hostname|g" configure
-	sed -i "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
+	sed -i -e "s|/usr/share/fonts/truetype/freefont|/usr/share/fonts/TTF|" \
+		-e 's,freetype/ftsynth.h,freetype2/ftsynth.h,' \
 		modules/text_renderer/freetype.c
 }
 
 post_install() {
 	# Remove unused stuff
-	rm -rf ${DESTDIR}/usr/include
-	rm -rf ${DESTDIR}/usr/lib/pkgconfig
-	rm -f ${DESTDIR}/usr/bin/vlc-config
-	rm -f ${DESTDIR}/usr/share/man/man1/vlc-config.1
 	rm -f ${DESTDIR}/usr/lib/vlc/plugins/plugins.dat
 	rm -f ${DESTDIR}/usr/lib/vlc/libcompat.a
 
@@ -59,6 +56,29 @@ post_install() {
 	ln -sf ../icons/hicolor/48x48/apps/vlc.png vlc.png
 }
 
+libvlc_package() {
+	replaces="vlc<2.1.1_2"
+	short_desc+=" - runtime libraries"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		for f in ${DESTDIR}/usr/lib/vlc/plugins/*; do
+			plugindir="$(basename ${f##${DESTDIR}})"
+			[ "$plugindir" = "gui" ] && continue
+			vmove usr/lib/vlc/plugins/$plugindir
+		done
+	}
+}
+
+vlc-devel_package() {
+	short_desc+=" - development files"
+	depends+="libvlc>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}
+
 vlc_package() {
 	depends="pulseaudio freefont-ttf hicolor-icon-theme desktop-file-utils"
 	pkg_install() {