diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 735fc427c3c7..5cb2e2691239 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -179,6 +179,7 @@
   grahamc = "Graham Christensen <graham@grahamc.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  guillaumekoenig = "Guillaume Koenig <guillaume.edward.koenig@gmail.com>";
   hakuch = "Jesse Haber-Kucharsky <hakuch@gmail.com>";
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix
new file mode 100644
index 000000000000..dbc2401970b9
--- /dev/null
+++ b/pkgs/development/tools/reno/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "reno-${version}";
+  version = "1.8.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/reno/${name}.tar.gz";
+    sha256 = "1pqg0xzcilmyrrnpa87m11xwlvfc94a98s28z9cgddkhw27lg3ps";
+  };
+
+  # Don't know how to make tests pass
+  doCheck = false;
+
+  # Nothing to strip (python files)
+  dontStrip = true;
+
+  propagatedBuildInputs = with pythonPackages; [ pbr six pyyaml ];
+  buildInputs = with pythonPackages; [ Babel ];
+
+  meta = with stdenv.lib; {
+    description = "Release Notes Manager";
+    homepage    = http://docs.openstack.org/developer/reno/;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ guillaumekoenig ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abd483d47773..63568bd91cc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6288,6 +6288,8 @@ in
 
   redo = callPackage ../development/tools/build-managers/redo { };
 
+  reno = callPackage ../development/tools/reno { };
+
   re2c = callPackage ../development/tools/parsing/re2c { };
 
   remake = callPackage ../development/tools/build-managers/remake { };