diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d859728c9f8c..fa004c859b41 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -34,6 +34,7 @@
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix
new file mode 100644
index 000000000000..b905a05474d3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2, gnome3 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "baobab-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz";
+    sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/baobab" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Baobab;
+    description = "Graphical application to analyse disk usage in any Gnome environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 197a135dcaaf..204a7600cf17 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -14,6 +14,8 @@ rec {
 
   at_spi2_core = callPackage ./core/at-spi2-core { };
 
+  baobab = callPackage ./core/baobab { };
+
   caribou = callPackage ./core/caribou { };
 
   dconf = callPackage ./core/dconf { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d67ec187d2b3..1dba884a2c07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7446,6 +7446,8 @@ let
   };
   awesome = awesome-3-5;
 
+  inherit (gnome3) baobab;
+
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
     ffmpeg = ffmpeg_1;
   };