diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
new file mode 100644
index 00000000000..c5188310772
--- /dev/null
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, x11, xineLib, libpng}:
+
+stdenv.mkDerivation {
+  name = "xine-ui-0.99.2";
+#  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-ui-0.99.2.tar.gz;
+    md5 = "4a4cf5cc68bf65e6845f501ea87fdf94";
+  };
+  buildInputs = [x11 xineLib libpng];
+  configureFlags = "--without-readline";
+}
diff --git a/pkgs/development/libraries/xine-lib/builder.sh b/pkgs/development/libraries/xine-lib/builder.sh
new file mode 100644
index 00000000000..8b499bbefcf
--- /dev/null
+++ b/pkgs/development/libraries/xine-lib/builder.sh
@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+if test -n "$libdvdcss"; then
+    # Ugly hack to force libdvdcss to be present (so the user doesn't
+    # have to set LD_LIBRARY_PATH).
+    export NIX_LDFLAGS="-rpath $libdvdcss/lib -L$libdvdcss/lib -ldvdcss $NIX_LDFLAGS"
+fi
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix
new file mode 100644
index 00000000000..8539bff54bd
--- /dev/null
+++ b/pkgs/development/libraries/xine-lib/default.nix
@@ -0,0 +1,29 @@
+{ xvideoSupport ? true
+, xineramaSupport ? true
+, encryptedDVDSupport ? true
+, alsaSupport ? true
+, stdenv, fetchurl, zlib, x11
+, libXv ? null, libXinerama ? null, libdvdcss ? null, alsaLib ? null
+}:
+
+assert xvideoSupport -> libXv != null;
+assert xineramaSupport -> libXinerama != null;
+assert encryptedDVDSupport -> libdvdcss != null;
+assert alsaSupport -> alsaLib != null;
+
+stdenv.mkDerivation {
+  name = "xine-lib-1-pre-rc7";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/xine/xine-lib-1-rc7.tar.gz;
+    md5 = "b3eaa0dd44fdbb8e3915399895c8414a";
+  };
+  buildInputs = [
+    x11
+    (if xvideoSupport then libXv else null)
+    (if xineramaSupport then libXinerama else null)
+    (if alsaSupport then alsaLib else null)
+  ];
+  libdvdcss = if encryptedDVDSupport then libdvdcss else null;
+  propagatedBuildInputs = [zlib];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index c4ec648e8b6..8bf27f6ce0e 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -654,6 +654,11 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  xineLib = (import ../development/libraries/xine-lib) {
+    inherit fetchurl stdenv zlib x11 libdvdcss alsaLib;
+    inherit (xlibs) libXv libXinerama;
+  };
+
   ncurses = (import ../development/libraries/ncurses) {
     inherit fetchurl stdenv;
   };
@@ -870,6 +875,10 @@ rec {
     alsa = alsaLib;
   };
 
+  xineUI = (import ../applications/video/xine-ui) {
+    inherit fetchurl stdenv x11 xineLib libpng;
+  };
+
   zapping = (import ../applications/video/zapping) {
     inherit fetchurl stdenv pkgconfig perl python 
             scrollkeeper gettext zvbi libjpeg libpng x11
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index c22599f5358..dd05fb13905 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -55,6 +55,7 @@ let {
     MPlayer
     MPlayerPlugin
     vlc
+    xineUI
     zapping
     gqview
     hello