diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index de455639e62..6239ed15271 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,10 +1,10 @@
 { xvSupport ? true
 , stdenv, fetchurl, perl, x11, libXv, wxGTK
-#libdvdcss, libdvdplay
+, libdvdread, libdvdnav, libdvdcss
 , zlib, mpeg2dec, a52dec, libmad, ffmpeg, alsa
 }:
 
-#assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
+assert libdvdread.libdvdcss == libdvdcss;
 assert xvSupport -> libXv != null;
 
 stdenv.mkDerivation {
@@ -16,10 +16,15 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    perl x11 wxGTK /* libdvdcss libdvdplay libdvdplay.libdvdread */
+    perl x11 wxGTK 
     zlib mpeg2dec a52dec libmad ffmpeg alsa
+    libdvdread # <- for "simple" DVD playback
+    libdvdnav libdvdcss # <- for DVD playback with menus
     (if xvSupport then libXv else null)
   ];
 
+  # Ensure that libdvdcss will be found without having to set LD_LIBRARY_PATH.
+  NIX_LDFLAGS = "-ldvdcss";
+
   configureFlags = "--enable-alsa";
 }
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
new file mode 100644
index 00000000000..48f990ea9ba
--- /dev/null
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libdvdnav-20050211";
+  src = fetchurl {
+    url = http://downloads.videolan.org/pub/videolan/vlc/0.8.4a/contrib/libdvdnav-20050211.tar.bz2;
+    md5 = "e1b1d45c8fdaf6a2dce3078bd3d7047d";
+  };
+}
diff --git a/pkgs/development/libraries/libdvdplay/default.nix b/pkgs/development/libraries/libdvdplay/default.nix
deleted file mode 100644
index 991ba758071..00000000000
--- a/pkgs/development/libraries/libdvdplay/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, libdvdread}:
-
-assert libdvdread != null;
-
-stdenv.mkDerivation {
-  name = "libdvdplay-1.0.1";
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/libdvdplay-1.0.1.tar.bz2;
-    md5 = "602bca4ef78d79aa87e5e8920d958a78";
-  };
-  buildInputs = [libdvdread];
-  inherit libdvdread;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb9a373b2a3..f3d5f407916 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1312,8 +1312,8 @@ rec {
     inherit fetchurl stdenv libdvdcss;
   };
 
-  libdvdplay = (import ../development/libraries/libdvdplay) {
-    inherit fetchurl stdenv libdvdread;
+  libdvdnav = import ../development/libraries/libdvdnav {
+    inherit fetchurl stdenv;
   };
 
   mpeg2dec = (import ../development/libraries/mpeg2dec) {
@@ -2208,7 +2208,8 @@ rec {
 
   vlc = (import ../applications/video/vlc) {
     inherit fetchurl stdenv perl x11 wxGTK
-            zlib mpeg2dec a52dec libmad ffmpeg;
+            zlib mpeg2dec a52dec libmad ffmpeg
+            libdvdread libdvdnav libdvdcss;
     inherit (xlibs) libXv;
     alsa = alsaLib;
   };
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 3bcd92bdb02..3cc122c17df 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -110,7 +110,7 @@ let {
     uulib
     valgrind
     vim
-#    vlc
+    vlc
     wget
     xchm
     xineUI