diff --git a/pkgs/development/interpreters/angelscript/2.22.nix b/pkgs/development/interpreters/angelscript/2.22.nix
new file mode 100644
index 000000000000..c9097bec5dc8
--- /dev/null
+++ b/pkgs/development/interpreters/angelscript/2.22.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, unzip}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="angelscript";
+    version = "2.22.2";
+    name="${baseName}-${version}";
+    url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
+    sha256 = "1pp853lbnz383ilp9wbgc3wv1dn7lpx3idz8dmzda94rckl7sd43";
+  };
+  buildInputs = [
+    unzip
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  preConfigure = ''
+    cd angelscript/projects/gnuc
+    sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
+    export SHARED=1 
+    export VERSION="${s.version}"
+    mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
+  '';
+  postBuild = ''
+    rm ../../lib/*
+  '';
+  postInstall = ''
+    mkdir -p "$out/share/docs/angelscript"
+    cp -r ../../../docs/* "$out/share/docs/angelscript"
+  '';
+  meta = {
+    inherit (s) version;
+    description = "Light-weight scripting library";
+    license = stdenv.lib.licenses.zlib ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = "http://www.angelcode.com/angelscript/downloads.html";
+    homepage="http://www.angelcode.com/angelscript/";
+  };
+}
diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix
index 3539a6302b14..bff367f750b3 100644
--- a/pkgs/development/libraries/ogrepaged/default.nix
+++ b/pkgs/development/libraries/ogrepaged/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig, ois, ogre, libX11, boost }:
 
 stdenv.mkDerivation rec {
-  name = "ogre-paged-1.1.3";
+  name = "ogre-paged-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "http://ogre-paged.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1qqlkg17plk87dm3fsm34x8lkd5rxkhiz77ppcgc71a7z050vhjq";
+    url = "https://github.com/RigsOfRods/ogre-pagedgeometry/archive/v${version}.tar.gz";
+    sha256 = "17j7rw9wbkynxbhm2lay3qgjnnagb2vd5jn9iijnn2lf8qzbgy82";
   };
 
   buildInputs = [ ois ogre libX11 boost ];
@@ -19,7 +20,5 @@ stdenv.mkDerivation rec {
     description = "Paged Geometry for Ogre3D";
     homepage = http://code.google.com/p/ogre-paged/;
     license = stdenv.lib.licenses.mit;
-    # Build failures
-    broken = true;
   };
 }
diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix
new file mode 100644
index 000000000000..c4477ab01d9e
--- /dev/null
+++ b/pkgs/games/rigsofrods/default.nix
@@ -0,0 +1,40 @@
+{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost,
+  pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip,
+  angelscript, ogrepaged, mysocketw, libxcb
+  }:
+
+stdenv.mkDerivation rec {
+  version = "git-20160412";
+  name = "rigsofrods-${version}";
+
+  src = fetchFromGitHub {
+    owner = "RigsOfRods";
+    repo = "rigs-of-rods";
+    rev = "1ebd359dbd467b4c3171dd6d054e7d8ec39f78ba";
+    sha256 = "0h71nrgq5r5cnh20c7wl8jzyaf50dj1b5jdrwihnklpsfyfvjlw4";
+  };
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../tools/linux/binaries/plugins.cfg
+    mkdir -p $out/share/rigsofrods
+    cp -r bin/* $out/share/rigsofrods
+    cp ../tools/linux/binaries/plugins.cfg $out/share/rigsofrods
+    mkdir -p $out/bin
+    ln -s $out/share/rigsofrods/{RoR,RoRConfig} $out/bin
+  '';
+
+  buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig
+    libuuid openal ogre ois curl gtk mygui unzip angelscript
+    ogrepaged mysocketw libxcb ];
+
+  meta = {
+    description = "3D simulator game where you can drive, fly and sail various vehicles";
+    homepage = http://rigsofrods.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [viric raskin];
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59bf88485ef2..57947babc1bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5247,6 +5247,8 @@ in
 
   angelscript = callPackage ../development/interpreters/angelscript {};
 
+  angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {};
+
   chibi = callPackage ../development/interpreters/chibi { };
 
   ceptre = callPackage ../development/interpreters/ceptre { };
@@ -14944,6 +14946,13 @@ in
     openglSupport = mesaSupported;
   };
 
+  rigsofrods = callPackage ../games/rigsofrods {
+    angelscript = angelscript_2_22;
+    mygui = mygui.override {
+      withOgre = true;
+    };
+  };
+
   rili = callPackage ../games/rili { };
 
   rimshot = callPackage ../games/rimshot { love = love_0_7; };