diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fcfe2556043..0f4e6fe2261 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -508,6 +508,7 @@
   ryanartecona = "Ryan Artecona <ryanartecona@gmail.com>";
   ryansydnor = "Ryan Sydnor <ryan.t.sydnor@gmail.com>";
   ryantm = "Ryan Mulligan <ryan@ryantm.com>";
+  rybern = "Ryan Bernstein <ryan.bernstein@columbia.edu>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   ryneeverett = "Ryne Everett <ryneeverett@gmail.com>";
   rzetterberg = "Richard Zetterberg <richard.zetterberg@gmail.com>";
diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix
new file mode 100644
index 00000000000..8ea8dfccb16
--- /dev/null
+++ b/pkgs/games/moon-buggy/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation rec {
+  baseName = "moon-buggy";
+  version = "1.0.51";
+  name = "${baseName}-${version}";
+
+  buildInputs = [
+    ncurses
+  ];
+
+  src = fetchurl {
+    url = "http://m.seehuhn.de/programs/${name}.tar.gz";
+    sha256 = "0gyjwlpx0sd728dwwi7pwks4zfdy9rm1w1xbhwg6zip4r9nc2b9m";
+  };
+
+  meta = {
+    description = ''A simple character graphics game where you drive some kind of car across the moon's surface'';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.rybern];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = http://www.seehuhn.de/pages/moon-buggy;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 664019fd6f6..00d56ee2be6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17300,6 +17300,8 @@ with pkgs;
 
   minecraft-server = callPackage ../games/minecraft-server { };
 
+  moon-buggy = callPackage ../games/moon-buggy {};
+
   multimc = libsForQt5.callPackage ../games/multimc { };
 
   minetest = callPackage ../games/minetest {