diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 45155864ff..ee968f10c4 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,31 +1,30 @@
 # Template file for 'vlc'
 pkgname=vlc
-version=2.0.3
-revision=3
+version=2.0.4
+revision=1
 build_style=gnu-configure
-configure_args="--disable-gme --disable-libtar --disable-jack
---disable-telepathy --disable-lua --disable-live555 --disable-fluidsynth
---enable-dvdread --enable-flac --disable-gnomevfs --disable-portaudio"
+configure_args="--disable-gme --disable-libtar --enable-jack
+ --disable-telepathy --disable-lua --disable-live555 --disable-fluidsynth
+ --enable-dvdread --enable-flac --disable-gnomevfs --disable-portaudio"
 # XXX Add missing deps: gme, telepathy, lua, live555, libtar (for skins2).
 depends="pulseaudio freefont-ttf hicolor-icon-theme desktop-file-utils"
 makedepends="pkg-config videoproto libudev-devel>=183 libpng-devel>=1.5.10
-libvorbis-devel SDL_image-devel x264-devel ffmpeg-devel
-xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9
-libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
-libmpeg2-devel libflac-devel fribidi-devel freetype-devel qt-devel
-avahi-libs-devel MesaLib-devel libmad-devel liba52-devel libdca-devel
-libdvbpsi-devel libgcrypt-devel gtk+-devel libnotify-devel dbus-glib-devel
-gnutls-devel taglib-devel libmatroska-devel libmpcdec-devel libproxy-devel
-libcdio-devel libdvdnav-devel libsysfs-devel libusb-compat-devel libmtp-devel>=1.1.4
-sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel
-samba-devel libmodplug-devel libva-devel v4l-utils-devel libsamplerate-devel"
-
+ libvorbis-devel SDL_image-devel x264-devel ffmpeg-devel jack-devel
+ xcb-util-devel>=0.3.9 xcb-util-keysyms-devel>=0.3.9 libsamplerate-devel
+ libXxf86vm-devel libXinerama-devel libXpm-devel libXvMC-devel libXv-devel
+ libmpeg2-devel libflac-devel fribidi-devel freetype-devel qt-devel
+ avahi-libs-devel MesaLib-devel libmad-devel liba52-devel libdca-devel
+ libdvbpsi-devel libgcrypt-devel gtk+-devel libnotify-devel dbus-glib-devel
+ gnutls-devel taglib-devel libmatroska-devel libmpcdec-devel libproxy-devel
+ libcdio-devel libdvdnav-devel libsysfs-devel libusb-compat-devel libmtp-devel>=1.1.4
+ sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel
+ samba-devel libmodplug-devel libva-devel v4l-utils-devel libass-devel"
 short_desc="VideoLan Client"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.videolan.org/vlc/"
 license="GPL-2"
 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.xz"
-checksum=fba9805f7415aebf5b88614de83802dc59d3282ff339128da41addf7e375d2d2
+checksum=4e066ed0d48ddc85aa1f01964945af666b5713cb6230d76347aebbc9a6553db6
 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,
diff --git a/srcpkgs/vlc/vlc.rshlibs b/srcpkgs/vlc/vlc.rshlibs
index 0a0b84844c..b5a1343e13 100644
--- a/srcpkgs/vlc/vlc.rshlibs
+++ b/srcpkgs/vlc/vlc.rshlibs
@@ -5,85 +5,76 @@ libdl.so.2
 libm.so.6
 libc.so.6
 libgcrypt.so.11
-libgpg-error.so.0
 libz.so.1
-libasound.so.2
 libavformat.so.53
-libavcodec.so.53
-libavutil.so.51
+libjack.so.0
 libmtp.so.9
-libusb-1.0.so.0
 libcddb.so.2
+libdvdnav.so.4
 libdvdread.so.4
-libv4l2.so.0
+libsmbclient.so.0
 libproxy.so.1
+libasound.so.2
+libpulse.so.0
+libv4l2.so.0
+libxcb-composite.so.0
 libxcb.so.1
 liba52.so.0
 libdca.so.0
 libmad.so.0
+libsamplerate.so.0
 libstdc++.so.6
 libgcc_s.so.1
-libSDL-1.2.so.0
-libpulse.so.0
+libspeexdsp.so.1
 libva-x11.so.1
 libva.so.1
 libX11.so.6
+libavcodec.so.53
+libavutil.so.51
 libFLAC.so.8
+libass.so.4
 libmpeg2.so.0
 libpng15.so.15
 libSDL_image-1.2.so.0
-libogg.so.0
+libSDL-1.2.so.0
 libspeex.so.1
+libtheoraenc.so.1
+libtheoradec.so.1
 libvorbisenc.so.2
 libvorbis.so.0
+libx264.so.120
 libxcb-keysyms.so.1
 libmatroska.so.5
 libebml.so.3
 libmodplug.so.1
 libmpcdec.so.5
-libQtGui.so.4
-libQtCore.so.4
+libogg.so.0
 libSM.so.6
 libICE.so.6
+libQtGui.so.4
+libQtCore.so.4
 libXext.so.6
 libXpm.so.4
+libXinerama.so.1
 libfribidi.so.0
 libfreetype.so.6
 libtag.so.1
+libxml2.so.2
+libgnutls.so.26
 libnotify.so.4
 libgtk-x11-2.0.so.0
-libgdk-x11-2.0.so.0
-libatk-1.0.so.0
-libgio-2.0.so.0
-libpangoft2-1.0.so.0
-libpangocairo-1.0.so.0
 libgdk_pixbuf-2.0.so.0
-libcairo.so.2
-libpango-1.0.so.0
-libfontconfig.so.1
 libgobject-2.0.so.0
 libglib-2.0.so.0
-libxml2.so.2
-librsvg-2.so.2
 libavahi-common.so.3
 libavahi-client.so.3
+libudev.so.1
+libgpg-error.so.0
+libfontconfig.so.1
+librsvg-2.so.2
 libxcb-randr.so.0
+libpostproc.so.52
 libswscale.so.2
 libxcb-shm.so.0
 libxcb-xv.so.0
 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
-libsmbclient.so.0
-libgnutls.so.26
-libudev.so.1