diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index aaccc8b5171b..f3f50a662406 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -1,16 +1,25 @@
-{stdenv, fetchurl, SDL, openal, freealut, zlib, libpng, python}:
+{ stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }:
 
-stdenv.mkDerivation {
-  name = "gemrb-0.2.9";
+stdenv.mkDerivation rec {
+  name = "gemrb-0.6.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/gemrb/gemrb-0.2.9.tar.gz;
-    sha256 = "0mygig4icx87a5skdv33yiwn8q4mv55f5qsks4sn40hrs69gcih0";
+    url = "mirror://sourceforge/gemrb/${name}.tar.gz";
+    sha256 = "1jnid5nrasy0lglnx71zkvv2p59cxsnhvagy7r8lsmjild1k5l93";
   };
 
-  buildInputs = [SDL openal freealut libpng python];
+  buildInputs = [ cmake python openal SDL zlib libpng libvorbis ];
 
-  configureFlags = "--with-zlib=${zlib}";
+  # Necessary to find libdl.
+  CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib";
+
+  # Can't have -werror because of the Vorbis header files.
+  cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
+
+  # !!! Ugly.  CMake passes library dependencies to the linker using
+  # the full path of the library rather than `-l...', and the
+  # ld-wrapper doesn't add the necessary `-rpath' flag.
+  NIX_LDFLAGS = "-rpath ${zlib}/lib -rpath ${libpng}/lib -rpath ${python}/lib -rpath ${openal}/lib -rpath ${SDL}/lib -rpath ${libvorbis}/lib";
 
   meta = {
     description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7576a0ce278..7a1914ca0d72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9307,7 +9307,7 @@ let
   };
 
   gemrb = import ../games/gemrb {
-    inherit fetchurl stdenv SDL openal freealut zlib libpng python;
+    inherit fetchurl stdenv cmake SDL openal zlib libpng python libvorbis;
   };
 
   gltron = import ../games/gltron {