diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 7b8f4ae914b2..9e920c597099 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -19,5 +19,12 @@ stdenv.mkDerivation rec {
   preInstall = ''
     installFlags="appdefaultdir=$out/share/X11/app-defaults"
   '';
-}
 
+  meta = {
+    homepage = http://www.x.org/;
+    description = "Allows testing the fonts available in an X server";
+    licesnse = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  }
+}
diff --git a/pkgs/applications/misc/xlsfonts/default.nix b/pkgs/applications/misc/xlsfonts/default.nix
new file mode 100644
index 000000000000..a63f8a72712e
--- /dev/null
+++ b/pkgs/applications/misc/xlsfonts/default.nix
@@ -0,0 +1,23 @@
+# This program used to come with xorg releases, but now I could only find it
+# at http://www.x.org/releases/individual/.
+# That is why this expression is not inside pkgs.xorg
+
+{stdenv, fetchurl, libX11, pkgconfig}:
+stdenv.mkDerivation rec {
+  name = "xlsfonts-1.0.2";
+
+  src = fetchurl {
+    url = "http://www.x.org/releases/individual/app/${name}.tar.bz2";
+    sha256 = "070iym754g3mf9x6xczl4gdnpvlk6rdyl1ndwhpjl21vg2dm2vnc";
+  };
+
+  buildInputs = [libX11 pkgconfig];
+
+  meta = {
+    homepage = http://www.x.org/;
+    description = "Lists the fonts available in the X server";
+    licesnse = "free";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  }
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c74e7da3ba49..186b0b2043d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6735,6 +6735,10 @@ let
     inherit fetchurl stdenv pkgconfig;
     inherit (xlibs) libX11 libXaw;
   };
+  xlsfonts = import ../applications/misc/xlsfonts {
+    inherit fetchurl stdenv pkgconfig;
+    inherit (xlibs) libX11;
+  };
 
   fspot = import ../applications/graphics/f-spot {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig mono