diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index f35e557145a..7c060e35e3e 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -21,6 +21,7 @@
   raskin = "Michael Raskin <7c6f434c@mail.ru>";
   roconnor = "Russell O'Connor <roconnor@theorem.ca>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
+  shlevy = "Shea Levy <shea@shealevy.com>";
   simons = "Peter Simons <simons@cryp.to>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
new file mode 100644
index 00000000000..b7cebc5795a
--- /dev/null
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, libuuid, popt }:
+
+stdenv.mkDerivation rec {
+  name = "gptfdisk-0.7.0";
+
+  src = fetchurl {
+    url = "http://www.rodsbooks.com/gdisk/${name}.tgz";
+    sha256 = "1912l01pj7wcaj2fp06yl6m893c52qh2qy0bkx33k6iq2k747zrf";
+  };
+
+  buildInputs = [ libuuid popt ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    ensureDir $out/share/man/man8
+    install -v -m755 gdisk sgdisk fixparts $out/bin
+    install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \
+        $out/share/man/man8
+  '';
+
+  meta = {
+    description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
+
+    license = "GPLv2";
+
+    homepage = http://www.rodsbooks.com/gdisk/;
+
+    maintainers = stdenv.lib.maintainers.shlevy;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f48594885d..d1d75636f84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -726,6 +726,8 @@ let
 
   gource = callPackage ../tools/misc/gource { };
 
+  gptfdisk = callPackage ../tools/system/gptfdisk { };
+
   graphviz = callPackage ../tools/graphics/graphviz {
     inherit (gtkLibs) pango;
   };