diff --git a/Makefile.am b/Makefile.am
index 062f8272953fbf1afc7ee547155a5d2875bd6c9c..26d6b1c2a12516f86aeda70ad383f9b3e40fac9d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -188,6 +188,7 @@ EXTRA_DIST = \
 
 man_MANS = \
 	man/ganeti.7 \
+	man/ganeti-cleaner.8 \
 	man/ganeti-masterd.8 \
 	man/ganeti-noded.8 \
 	man/ganeti-os-interface.7 \
diff --git a/man/footer.sgml b/man/footer.sgml
index 70582739f668ad4e174a7f6497930316946d09d2..369c2aba108b5cb5b3d7f772b65f00a26f6f76a4 100644
--- a/man/footer.sgml
+++ b/man/footer.sgml
@@ -59,6 +59,10 @@
         <refentrytitle>ganeti-watcher</refentrytitle>
         <manvolnum>8</manvolnum>
       </citerefentry> (automatic instance restarter),
+      <citerefentry>
+        <refentrytitle>ganeti-cleaner</refentrytitle>
+        <manvolnum>8</manvolnum>
+      </citerefentry> (job queue cleaner),
       <citerefentry>
         <refentrytitle>ganeti-noded</refentrytitle>
         <manvolnum>8</manvolnum>
diff --git a/man/ganeti-cleaner.sgml b/man/ganeti-cleaner.sgml
new file mode 100644
index 0000000000000000000000000000000000000000..ac60bdaf620125f3ed79fb89970f240c12e4f2dc
--- /dev/null
+++ b/man/ganeti-cleaner.sgml
@@ -0,0 +1,78 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>February 11, 2009</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
+  <!ENTITY dhucpackage "<refentrytitle>ganeti-cleaner</refentrytitle>">
+  <!ENTITY dhpackage   "ganeti-cleaner">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+  <!ENTITY footer SYSTEM "footer.sgml">
+]>
+
+<refentry>
+  <refentryinfo>
+    <copyright>
+      <year>2009</year>
+      <holder>Google Inc.</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+    <refmiscinfo>ganeti 2.0</refmiscinfo>
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>ganeti job queue cleaner</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>
+      The <command>&dhpackage;</command> is a periodically run script to clean
+      old job files from the job queue archive.
+    </para>
+
+    <para>
+      <command>&dhpackage;</command> automatically removes all files older than
+      21 days from
+      <filename>@LOCALSTATEDIR@/lib/ganeti/queue/archive</filename>.
+    </para>
+
+  </refsect1>
+
+  &footer;
+
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->