diff --git a/srcpkgs/vlc/patches/vlc-1.1.13-skin2_theme_loader.patch b/srcpkgs/vlc/patches/vlc-1.1.13-skin2_theme_loader.patch
deleted file mode 100644
index d488a8ee40..0000000000
--- a/srcpkgs/vlc/patches/vlc-1.1.13-skin2_theme_loader.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:07.000000000 +0100
-+++ modules/gui/skins2/src/theme_loader.cpp	2012-02-02 17:52:19.000000000 +0100
-@@ -768,7 +768,7 @@
-     {
-         void *toClose = currentGzVp;
-         currentGzVp = NULL;  currentGzFd = -1;
--        return gzclose( toClose );
-+        return gzclose( (gzFile) toClose );
-     }
-     return -1;
- }
-@@ -777,7 +777,7 @@
- {
-     if( currentGzVp != NULL && fd != -1 )
-     {
--        return gzread( currentGzVp, p_buffer, i_length );
-+        return gzread( (gzFile) currentGzVp, p_buffer, i_length );
-     }
-     return -1;
- }
-@@ -786,7 +786,7 @@
- {
-     if( currentGzVp != NULL && fd != -1 )
-     {
--        return gzwrite( currentGzVp, const_cast<void*>(p_buffer), i_length );
-+        return gzwrite( (gzFile) currentGzVp, const_cast<void*>(p_buffer), i_length );
-     }
-     return -1;
- }
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 6de8a12734..dbd174b28a 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,18 +1,16 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=1.1.13
-distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
+version=2.0.0
+distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz"
 build_style=gnu-configure
-configure_args="--disable-gme --disable-libtar --enable-snapshot
---disable-telepathy --disable-lua --disable-live555
---enable-dvdread --enable-flac --disable-gnomevfs --enable-v4l
---disable-jack --disable-fluidsynth --disable-portaudio"
-revision=1
+configure_args="--disable-gme --disable-libtar --disable-jack
+--disable-telepathy --disable-lua --disable-live555 --disable-fluidsynth
+--enable-dvdread --enable-flac --disable-gnomevfs --disable-portaudio"
 short_desc="VideoLan Client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
 license="GPL-2"
-checksum=03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
+checksum=455fc04b5f7ce3d7294ed71a9dd172ff4eb97875cfc30b554ef4ce55ec6f5106
 long_desc="
  VLC media player is a highly portable multimedia player supporting most
  audio and video formats (H.264, Ogg, DivX, MKV, TS, MPEG-2, mp3, MPEG-4,
@@ -79,12 +77,13 @@ Add_dependency build samba-devel
 Add_dependency build libmodplug-devel
 Add_dependency build libva-devel
 Add_dependency build v4l-utils-devel
+Add_dependency build libsamplerate-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|" \
-		modules/misc/freetype.c
+		modules/text_renderer/freetype.c
 }
 
 post_install() {
diff --git a/srcpkgs/vlc/vlc.rshlibs b/srcpkgs/vlc/vlc.rshlibs
index 6e7926b2e6..a52ec04790 100644
--- a/srcpkgs/vlc/vlc.rshlibs
+++ b/srcpkgs/vlc/vlc.rshlibs
@@ -4,7 +4,6 @@ libpthread.so.0
 libdl.so.2
 libm.so.6
 libc.so.6
-libdvbpsi.so.5
 libgcrypt.so.11
 libgpg-error.so.0
 libz.so.1
@@ -14,7 +13,6 @@ libavcodec.so.53
 libavutil.so.51
 libmtp.so.8
 libusb-0.1.so.4
-libsmbclient.so.0
 libcddb.so.2
 libdvdread.so.4
 libv4l2.so.0
@@ -36,7 +34,6 @@ libpng14.so.14
 libSDL_image-1.2.so.0
 libogg.so.0
 libspeex.so.1
-libtheora.so.0
 libvorbisenc.so.2
 libvorbis.so.0
 libxcb-keysyms.so.1
@@ -70,7 +67,6 @@ libgthread-2.0.so.0
 libglib-2.0.so.0
 libxml2.so.2
 libgnutls.so.26
-libsqlite3.so.0
 librsvg-2.so.2
 libavahi-common.so.3
 libavahi-client.so.3
@@ -79,8 +75,16 @@ libxcb-randr.so.0
 libswscale.so.2
 libxcb-shm.so.0
 libxcb-xv.so.0
-libX11-xcb.so.1
 libGL.so.1
 libx264.so.120
 libpostproc.so.52
 libdvdnav.so.4
+libxcb-composite.so.0
+libxcb-xfixes.so.0
+libxcb-render.so.0
+libxcb-shape.so.0
+libsamplerate.so.0
+libspeexdsp.so.1
+libtheoraenc.so.1
+libtheoradec.so.1
+libXinerama.so.1