diff --git a/.gitignore b/.gitignore
index 2a26f68..695fe88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,11 +19,13 @@
 /beelib.config.sh
 /bee.1
 /bee-check.1
+/bee-download.1
 /bee-init.1
 /bee-install.1
 /bee-list.1
 /bee-query.1
 /bee-remove.1
+/bee-update.1
 /beefind.sh
 /bee-cache-inventory
 /bee-cache-update.sh
@@ -32,7 +34,6 @@
 /content2filelist.sh
 /filelist2content.sh
 /buildtypes/*.sh
-/manpages/*.1
 /.beerc
 *.tar.gz
 *.o
diff --git a/Makefile b/Makefile
index 3875459..1a4f61d 100644
--- a/Makefile
+++ b/Makefile
@@ -136,12 +136,11 @@ BEEGETOPT_OBJECTS=bee_getopt.o beegetopt.o
 BEEFLOCK_OBJECTS=bee_getopt.o beeflock.o
 BEECACHEINVENTORY_OBJECTS=bee-cache-inventory.o bee_getopt.o
 
-bee_MANPAGES=$(addprefix manpages/,${MANPAGES})
 bee_BUILDTYPES=$(addsuffix .sh,$(addprefix buildtypes/,$(BUILDTYPES)))
 
 shellscripts: $(addsuffix .sh,$(SHELLSCRIPTS)) $(LIBRARY_SHELL)
 cprograms:    $(PROGRAMS_C) ${HELPER_C}
-manpages:     ${bee_MANPAGES}
+manpages:     $(MANPAGES)
 buildtypes:   ${bee_BUILDTYPES}
 
 beesep: $(addprefix src/, ${BEESEP_OBJECTS})
@@ -174,7 +173,7 @@ bee-cache-inventory: $(addprefix src/, ${BEECACHEINVENTORY_OBJECTS})
 %.sh: src/%.sh.in
 	$(call quiet-command,sed ${sed-rules} $< >$@,"SED	$@")
 
-%.1: %.1.in
+%.1: manpages/%.1.in
 	$(call quiet-command,sed ${sed-rules} $< >$@,"SED	$@")
 
 %.sh: %.sh.in
@@ -185,7 +184,7 @@ clean:
 	$(call quiet-command,rm -f ${PROGRAMS_C},"CLEAN	${PROGRAMS_C}")
 	$(call quiet-command,rm -f ${HELPER_C},"CLEAN	${HELPER_C}")
 	$(call quiet-command,rm -f src/*.o,"CLEAN	c object files")
-	$(call quiet-command,rm -f ${bee_MANPAGES},"CLEAN	manpages")
+	$(call quiet-command,rm -f ${MANPAGES},"CLEAN	manpages")
 	$(call quiet-command,rm -f ${bee_BUILDTYPES},"CLEAN	buildtypes")
 
 install: install-core install-config
@@ -254,7 +253,7 @@ install-man: $(addprefix ${DESTDIR}${MANDIR}/man1/,${MANPAGES})
 install-dir-mandir:
 	$(call quiet-installdir,0755,${DESTDIR}${MANDIR}/man1)
 
-${DESTDIR}${MANDIR}/man1/%.1: manpages/%.1 install-dir-mandir
+${DESTDIR}${MANDIR}/man1/%.1: %.1 install-dir-mandir
 	$(call quiet-install,0644,$<,$@)
 
 install-dir-config:
diff --git a/manpages/Makefile b/manpages/Makefile
new file mode 100644
index 0000000..1326e0d
--- /dev/null
+++ b/manpages/Makefile
@@ -0,0 +1,32 @@
+quiet-command = $(if ${V},${1},$(if ${2},@echo ${2} && ${1}, @${1}))
+
+MANPAGES += bee
+MANPAGES += bee-check
+MANPAGES += bee-download
+MANPAGES += bee-list
+MANPAGES += bee-init
+MANPAGES += bee-install
+MANPAGES += bee-query
+MANPAGES += bee-remove
+
+XMLTO       = xmlto
+XMLTO_FLAGS = --stringparam man.output.quietly=1
+
+.PHONY: all
+all:
+	@echo "Following targets are availabe:"
+	@echo "        xml2man - update manpages"
+
+.PHONY: xml2man
+xml2man: force-clean $(addsuffix .1.in,$(MANPAGES))
+
+.PHONY: force-clean
+force-clean:
+	$(call quiet-command,rm -f $(addsuffix .1.in,$(MANPAGES)),"CLEAN	*.1.in")
+	$(call quiet-command,rm -f $(addsuffix .1,   $(MANPAGES)),"CLEAN	*.1")
+
+%.1: %.xml
+	$(call quiet-command,$(XMLTO) $(XMLTO_FLAGS) man $<,"XMLTO	$<")
+
+%.1.in: %.1
+	$(call quiet-command,mv $< $@,"RENAME	$<")
diff --git a/manpages/bee-check.1.in b/manpages/bee-check.1.in
index 6fd11e3..83a0470 100644
--- a/manpages/bee-check.1.in
+++ b/manpages/bee-check.1.in
@@ -1,93 +1,82 @@
-." manpage of bee-check
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-check" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-check
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-CHECK" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-check \- Perform some consistency checks on a bee package
-
+bee-check \- perform some consistency checks on a bee package
 .SH "SYNOPSIS"
-.SY "bee check"
-.OP options
-.I <pattern>
-.YS
-
+.HP \w'\fBbee\ check\fR\ 'u
+\fBbee check\fR [options] \fI<pattern>\fR
 .SH "DESCRIPTION"
-.P
-.B bee-check
+.PP
+\fBbee\-check\fR
 is used to perform consistency checks on a bee package matching
-.I <pattern>
-and shows missing link targets, missing files and directories or changed md5 sums.
-
+\fIpattern\fR
+and shows missing link targets, missing files and directories or changed md5 sums\&.
 .SH "OPTIONS"
-.TP
-.B \-d, \-\-deps, \-\-dependencies
-Print package dependencies.
-.TP
-.B \-f, \-\-force
-Use
-.B \-\-force
-to check all packages matching
-.IR <pattern> ,
-if it does not match a full packagename.
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
+.PP
+\fB\-d, \-\-deps, \-\-dependencies\fR
+.RS 4
+Print package dependencies\&.
+.RE
+.PP
+\fB\-f, \-\-force\fR
+.RS 4
+Check all packages matching
+\fIpattern\fR
+if it does not match a full packagename\&.
+.RE
+.PP
+\fB\-h, \-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_METADIR
-.RS
+.PP
+\fBBEE_METADIR\fR
+.RS 4
 Directory searched for installed bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-check.xml b/manpages/bee-check.xml
new file mode 100644
index 0000000..87c8f8c
--- /dev/null
+++ b/manpages/bee-check.xml
@@ -0,0 +1,138 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-check
+
+    Copyright (C) 2013
+          Matthias Ruester <ruester@molgen.mpg.de>
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-check">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-check</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-check</refname>
+                <refpurpose>perform some consistency checks on a bee package</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee check</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;pattern&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><command>bee-check</command> is used to perform
+                consistency checks on a bee package matching
+                <replaceable>pattern</replaceable> and shows missing link
+                targets, missing files and directories or changed
+                md5 sums.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-d, --deps, --dependencies</option></term>
+
+                                <listitem><para>Print package dependencies.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-f, --force</option></term>
+
+                                <listitem><para>Check all packages matching <replaceable>pattern</replaceable> if it does not match a full packagename.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h, --help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_METADIR</option></term>
+                        <listitem><para>Directory searched for installed bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-download.1.in b/manpages/bee-download.1.in
index 16b2907..4fad1bc 100644
--- a/manpages/bee-download.1.in
+++ b/manpages/bee-download.1.in
@@ -1,95 +1,90 @@
-." manpage of bee-download
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-download" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-download
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-DOWNLOAD" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-download \- Download a repository and convert it into a source tarball
-
+bee-download \- Download a repository and convert it into a source tarball
 .SH "SYNOPSIS"
-.SY "bee download"
-.OP options
-.I <repository-url>
-.YS
-
+.HP \w'\fBbee\ download\fR\ 'u
+\fBbee download\fR [options] \fI<repository\-url>\fR
 .SH "DESCRIPTION"
-.P
-.B bee-download
-is used to download a repository and convert it into a source tarball. This tarball can be used to
-create a beefile via
-.BR "bee init" .
+.PP
 
+\fBbee\-download\fR
+is used to download a repository and convert it into a source tarball\&. This tarball can be used to create a beefile via
+\fBbee\-init\fR\&.
 .SH "OPTIONS"
-.TP
-.BI "\-n, \-\-pkgname" " <name>"
-Specifiy the tarballs package name.
-.TP
-.BI "\-v, \-\-pkgversion" " <version>"
-Specifiy the tarballs package version.
-.TP
-.BI "\-c, \-\-commit" " <rev>"
-When downloading from a git repository: Use a certain commit as the HEAD revision.
-.TP
-.B \-t, \-\-type
-Specify the type of download (http, https or git).
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
+.PP
+\fB\-n\fR, \fB\-\-pkgname \fR\fB\fI<name>\fR\fR
+.RS 4
+Specify the tarball\'s package name\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-pkgversion \fR\fB\fI<version>\fR\fR
+.RS 4
+Specify the tarball\'s package version\&.
+.RE
+.PP
+\fB\-c\fR, \fB\-\-commit \fR\fB\fI<rev>\fR\fR
+.RS 4
+When downloading from a git repository: Use a certain commit as the HEAD revision\&.
+.RE
+.PP
+\fB\-t\fR, \fB\-\-type\fR
+.RS 4
+Specify the type of download (http, https or git)\&.
+.RE
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_DOWNLOADDIR
-.RS
-The downloaded file is placed here.
+.PP
+\fBBEE_DOWNLOADDIR\fR
+.RS 4
+The downloaded file is placed here\&.
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-download.xml b/manpages/bee-download.xml
new file mode 100644
index 0000000..c6f88e7
--- /dev/null
+++ b/manpages/bee-download.xml
@@ -0,0 +1,159 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-download
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-download">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-download</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-download</refname>
+                <refpurpose>Download a repository and convert it into a source tarball</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee download</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;repository-url&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>
+                <command>bee-download</command> is used to download a repository and convert it
+                into a source tarball. This tarball can be used to create a beefile via
+                <command>bee-init</command>.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-n</option></term>
+                                <term><option>--pkgname <replaceable>&lt;name&gt;</replaceable></option></term>
+
+                                <listitem><para>Specify the tarball's package name.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-v</option></term>
+                                <term><option>--pkgversion <replaceable>&lt;version&gt;</replaceable></option></term>
+
+                                <listitem><para>Specify the tarball's package version.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-c</option></term>
+                                <term><option>--commit <replaceable>&lt;rev&gt;</replaceable></option></term>
+
+                                <listitem><para>
+                                When downloading from a git repository: Use a certain commit
+                                as the HEAD revision.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-t</option></term>
+                                <term><option>--type</option></term>
+
+                                <listitem><para>
+                                Specify the type of download (http, https or git).
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_DOWNLOADDIR</option></term>
+                        <listitem><para>The downloaded file is placed here.</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-init.1.in b/manpages/bee-init.1.in
index 3d7953c..635b30f 100644
--- a/manpages/bee-init.1.in
+++ b/manpages/bee-init.1.in
@@ -1,149 +1,137 @@
-." manpage of bee-init
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-init" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-init
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-INIT" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-init \- Create a bee file for building a bee package
-
+bee-init \- Create a bee file for building a bee package
 .SH "SYNOPSIS"
-.SY "bee init"
-.OP options
-.I <url-to-sources>
-.OP "-- configure options"
-.YS
-
+.HP \w'\fBbee\ init\fR\ 'u
+\fBbee init\fR [options] \fI<url\-to\-source>\fR [\-\-\ configure\ options]
 .SH "DESCRIPTION"
-.P
-.B bee-init
-is used to create a file, that is run in order to build a bee package.
-
+.PP
+\fBbee\-init\fR
+is used to create a file, that is run in order to build a bee package\&.
 .SH "OPTIONS"
-.TP
-.BI \-\-configure " <mode>"
-Use the configure mode 'compat' if DATAROOTDIR is not supported in your build process.
-.TP
-.BI \-\-buildtype " <type>"
-Force buildtype: configure, cmake, make, autogen, perl-module, perl-module-makemaker, python-module
-.TP
-.B \-\-disable-versionify
-Do not substitute version numbers in the source url.
-.TP
-.BI "\-t, \-\-template" " <template>"
-Create bee file with template
-.IR <template> .
-.TP
-.B \-f, \-\-force
-Overwrite already existing beefile.
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-.TP
-.B \-v, \-\-version
-Print version number.
-.TP
-.B \-e, \-\-execute
-Execute the bee file after creation.
-.TP
-.B \-i, \-\-install
-Execute the bee file and install the package.
-.TP
-.B \-\-prefix
-.TQ
-.B \-\-eprefix
-.TQ
-.B \-\-bindir
-.TQ
-.B \-\-sbindir
-.TQ
-.B \-\-libexecdir
-.TQ
-.B \-\-sysconfdir
-.TQ
-.B \-\-localstatedir
-.TQ
-.B \-\-sharedstatedir
-.TQ
-.B \-\-libdir
-.TQ
-.B \-\-includedir
-.TQ
-.B \-\-datarootdir
-.TQ
-.B \-\-datadir
-.TQ
-.B \-\-infodir
-.TQ
-.B \-\-mandir
-.TQ
-.B \-\-docdir
-.TQ
-.B \-\-localedir
-Set these directories, if you do not want to install to the default locations.
-
+.PP
+\fB\-\-configure \fR\fB\fImode\fR\fR
+.RS 4
+Use the configure mode \'compat\' if DATAROOTDIR is not supported in your build process\&.
+.RE
+.PP
+\fB\-\-buildtype \fR\fB\fItype\fR\fR
+.RS 4
+Force builtype: configure, cmake, make, autogen, perl\-module, perl\-module\-makemaker, phython\-module
+.RE
+.PP
+\fB\-\-disable\-versionify\fR
+.RS 4
+Do not substitute version numbers in the source url\&.
+.RE
+.PP
+\fB\-f\fR, \fB\-\-force\fR
+.RS 4
+Overwrite already existing bee\-file\&.
+.RE
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
+.PP
+\fB\-V\fR, \fB\-\-version\fR
+.RS 4
+Print version number\&.
+.RE
+.PP
+\fB\-D\fR, \fB\-\-define \fR\fB\fIA\fR\fR\fB \fR\fB\fIB\fR\fR
+.RS 4
+Define environment variables within the bee\-file\&. Extra (over)quoting may be needed if B contains spaces\&.
+.RE
+.PP
+\fB\-o\fR, \fB\-\-output \fR\fB\fIbee\-file\fR\fR
+.RS 4
+Name of the new bee\-file\&.
+.RE
+.PP
+\fB\-e\fR, \fB\-\-execute\fR
+.RS 4
+Execute the bee\-file after creation\&.
+.RE
+.PP
+\fB\-i\fR, \fB\-\-install\fR
+.RS 4
+Execute the bee\-file and install software\&.
+.RE
+.SH "NAMING BEE-FILES"
+.PP
+\fB\-\-pkgextraname \fR\fB\fINAME\fR\fR
+.RS 4
+Add pkgextraname \'_NAME\' to bee\-file\-name\&.
+.RE
+.PP
+\fB\-\-pkgprefix \fR\fB\fINAME\fR\fR
+.RS 4
+Prefix bee\-file with \'NAME\-\'\&.
+.RE
+.SH "INSTALLATION DIRECTORIES"
+.PP
+\fB\-\-prefix\fR, \fB\-\-eprefix\fR, \fB\-\-bindir\fR, \fB\-\-sbindir\fR, \fB\-\-libexecdir\fR, \fB\-\-sysconfdir\fR, \fB\-\-localstatedir\fR, \fB\-\-sharedstatedir\fR, \fB\-\-libdir\fR, \fB\-\-includedir\fR, \fB\-\-datarootdir\fR, \fB\-\-datadir\fR, \fB\-\-infodir\fR, \fB\-\-mandir\fR, \fB\-\-docdir\fR, \fB\-\-localedir\fR
+.RS 4
+Set these directories, if you do not want to install to the default locations\&.
+.RE
 .SH "CONFIGURE OPTIONS"
-.P
+.PP
 Package specific configure options may be appended at the end of your
-.B bee\-init
-line, e.g.
-.br
-.B bee init http://ftp.gnome.org/pub/gnome/sources/gtk+/3.5/gtk+-3.5.2.tar.xz
-.B -- --enable-introspection --enable-xinerama
-.br
+\fBbee\-init\fR
+line, e\&.g\&.
+\fBbee init http://ftp\&.gnome\&.org/pub/gnome/sources/gtk+/3\&.5/gtk+\-3\&.5\&.2\&.tar\&.xz \-\- \-\-enable\-introspection \-\-enable\-xinerama \fR
 will automatically append
-.B --enable-introspection --enable-xinerama
+\fB\-\-enable\-introspection\fR
+and
+\fB\-\-enable\-xinerama\fR
 to the
-.B bee_configure
-call in your bee file.
+\fBbee_configure\fR
+call in your bee\-file\&.
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-init.xml b/manpages/bee-init.xml
new file mode 100644
index 0000000..0c05e09
--- /dev/null
+++ b/manpages/bee-init.xml
@@ -0,0 +1,255 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-init
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-init">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-init</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-init</refname>
+                <refpurpose>Create a bee file for building a bee package</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee init</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;url-to-source&gt;</replaceable></arg>
+                        <arg choice="opt">-- configure options</arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><command>bee-init</command> is used to create
+                a file, that is run in order to build a bee package.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>--configure <replaceable>mode</replaceable></option></term>
+
+                                <listitem><para>
+                                Use the configure mode 'compat' if DATAROOTDIR
+                                is not supported in your build process.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--buildtype <replaceable>type</replaceable></option></term>
+
+                                <listitem><para>
+                                Force builtype: configure, cmake, make, autogen, perl-module,
+                                perl-module-makemaker, phython-module
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--disable-versionify</option></term>
+
+                                <listitem><para>
+                                Do not substitute version numbers in the source url.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-f</option></term>
+                                <term><option>--force</option></term>
+
+                                <listitem><para>
+                                Overwrite already existing bee-file.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-V</option></term>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Print version number.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-D</option></term>
+                                <term><option>--define <replaceable>A</replaceable> <replaceable>B</replaceable></option></term>
+
+                                <listitem><para>
+                                Define environment variables within the bee-file.
+                                Extra (over)quoting may be needed if B contains spaces.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-o</option></term>
+                                <term><option>--output <replaceable>bee-file</replaceable></option></term>
+
+                                <listitem><para>
+                                Name of the new bee-file.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-e</option></term>
+                                <term><option>--execute</option></term>
+
+                                <listitem><para>
+                                Execute the bee-file after creation.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-i</option></term>
+                                <term><option>--install</option></term>
+
+                                <listitem><para>
+                                Execute the bee-file and install software.
+                                </para></listitem>
+                        </varlistentry>
+                 </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Naming bee-files</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>--pkgextraname <replaceable>NAME</replaceable></option></term>
+
+                                <listitem><para>
+                                Add pkgextraname '_NAME' to bee-file-name.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--pkgprefix <replaceable>NAME</replaceable></option></term>
+
+                                <listitem><para>
+                                Prefix bee-file with 'NAME-'.
+                                </para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Installation Directories</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>--prefix</option></term>
+                                <term><option>--eprefix</option></term>
+                                <term><option>--bindir</option></term>
+                                <term><option>--sbindir</option></term>
+                                <term><option>--libexecdir</option></term>
+                                <term><option>--sysconfdir</option></term>
+                                <term><option>--localstatedir</option></term>
+                                <term><option>--sharedstatedir</option></term>
+                                <term><option>--libdir</option></term>
+                                <term><option>--includedir</option></term>
+                                <term><option>--datarootdir</option></term>
+                                <term><option>--datadir</option></term>
+                                <term><option>--infodir</option></term>
+                                <term><option>--mandir</option></term>
+                                <term><option>--docdir</option></term>
+                                <term><option>--localedir</option></term>
+
+                                <listitem><para>Set these directories, if you do not want
+                                to install to the default locations.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Configure Options</title>
+                <para>
+                Package specific configure options may be appended at the end of your
+                <command>bee-init</command> line, e.g.
+                <command>bee init http://ftp.gnome.org/pub/gnome/sources/gtk+/3.5/gtk+-3.5.2.tar.xz
+                -- --enable-introspection --enable-xinerama
+                </command> will automatically append
+                <command>--enable-introspection</command> and <command>--enable-xinerama</command>
+                to the <command>bee_configure</command> call in your bee-file.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-install.1.in b/manpages/bee-install.1.in
index 8a38577..26ea3ac 100644
--- a/manpages/bee-install.1.in
+++ b/manpages/bee-install.1.in
@@ -1,108 +1,114 @@
-." manpage of bee-install
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-install" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-install
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-INSTALL" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-install \- Install a bee package
-
+bee-install \- Install a bee package
 .SH "SYNOPSIS"
-.SY "bee install"
-.OP options
-.I <bee-package>
-.YS
-
+.HP \w'\fBbee\ install\fR\ 'u
+\fBbee install\fR [options] \fI<bee\-package>\fR
+.HP \w'\fBbee\ update\fR\ 'u
+\fBbee update\fR [options] \fI<bee\-package>\fR
 .SH "DESCRIPTION"
-.P
-.B bee-install
-is used to install a bee package.
-.P
+.PP
+
+\fBbee\-install\fR
+is used to install a bee package\&.
+.PP
 Normally
-.B bee-install
+\fBbee\-install\fR
 searches
-.B BEE_PKGDIR
+\fBBEE_PKGDIR\fR
 for
-.I <bee-package>
+\fI<bee\-package>\fR
 but you can use
-.BI /path/to/ <bee-package> .bee.tar.bz2
-too.
-
+\fB/path/to/\fR\fI<bee\-package>\fR\fB\&.bee\&.tar\&.bz2\fR
+too\&.
+.PP
+\fBbee\-update\fR
+is the short form of \'\fBbee install \-\-update\fR\'\&.
 .SH "OPTIONS"
-.TP
-.B \-f, \-\-force
+.PP
+\fB\-f\fR, \fB\-\-force\fR
+.RS 4
 Prevent
-.B bee-install
+\fBbee\-install\fR
 from checking whether
-.I <bee-package>
-is already installed.
-.TP
-.B \-u, \-\-update, \-\-upgrade
+\fI<bee\-package>\fR
+is already installed\&.
+.RE
+.PP
+\fB\-u\fR, \fB\-\-update\fR, \fB\-\-upgrade\fR
+.RS 4
 Update an installed
-.IR <bee-package> .
-.TP
-.B \-n, \-\-noop
-Do not install. Just print which files would be installed.
-.TP
-.B \-r, \-\-remove-all
-When updating: Remove all older versions of the package.
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
+\fI<bee\-package>\fR\&.
+.RE
+.PP
+\fB\-n\fR, \fB\-\-noop\fR
+.RS 4
+Do not install\&. Just print which files would be installed\&.
+.RE
+.PP
+\fB\-r\fR, \fB\-\-remove\-all\fR
+.RS 4
+When updating: Remove all older versions of the package\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-verbose\fR
+.RS 4
+Be more verbose (can be use twice e\&.g\&. \-vv)\&.
+.RE
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_PKGDIR
-.RS
+.PP
+\fBBEE_PKGDIR\fR
+.RS 4
 Directory searched for available bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-install.xml b/manpages/bee-install.xml
new file mode 100644
index 0000000..cf55d32
--- /dev/null
+++ b/manpages/bee-install.xml
@@ -0,0 +1,184 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-install
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-install">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-install</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-install</refname>
+                <refpurpose>Install a bee package</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee install</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;bee-package&gt;</replaceable></arg>
+                </cmdsynopsis>
+                <cmdsynopsis>
+                        <command>bee update</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;bee-package&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>
+                <command>bee-install</command> is used to install a bee package.
+                </para>
+                <para>
+                Normally <command>bee-install</command> searches <command>BEE_PKGDIR</command>
+                for <replaceable>&lt;bee-package&gt;</replaceable> but you can use
+                <command>/path/to/</command><replaceable>&lt;bee-package&gt;</replaceable><command>.bee.tar.bz2</command> too.
+                </para>
+                <para><command>bee-update</command> is the short form of '<command>bee install --update</command>'.</para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-f</option></term>
+                                <term><option>--force</option></term>
+
+                                <listitem><para>
+                                Prevent <command>bee-install</command> from checking whether
+                                <replaceable>&lt;bee-package&gt;</replaceable>
+                                is already installed.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-u</option></term>
+                                <term><option>--update</option></term>
+                                <term><option>--upgrade</option></term>
+
+                                <listitem><para>
+                                Update an installed
+                                <replaceable>&lt;bee-package&gt;</replaceable>.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-n</option></term>
+                                <term><option>--noop</option></term>
+
+                                <listitem><para>
+                                Do not install. Just print which files would be installed.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-r</option></term>
+                                <term><option>--remove-all</option></term>
+
+                                <listitem><para>
+                                When updating: Remove all older versions of the package.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-v</option></term>
+                                <term><option>--verbose</option></term>
+
+                                <listitem><para>
+                                Be more verbose (can be use twice e.g. -vv).
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_PKGDIR</option></term>
+                        <listitem><para>Directory searched for available bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-list.1.in b/manpages/bee-list.1.in
index 7f06ebb..78117f5 100644
--- a/manpages/bee-list.1.in
+++ b/manpages/bee-list.1.in
@@ -1,104 +1,107 @@
-." manpage of bee-list
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-list" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-list
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-LIST" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-list \- List bee packages
-
+bee-list \- List bee packages
 .SH "SYNOPSIS"
-.SY "bee list"
-.OP options
-.I <pattern>
-.YS
-
+.HP \w'\fBbee\ list\fR\ 'u
+\fBbee list\fR [options] \fI<pattern>\fR
 .SH "DESCRIPTION"
-.P
-.B bee-list
-is used to display all bee packages that are installed, available, uninstalled or updatable.
-
+.PP
+\fBbee\-list\fR
+is used to display all bee packages that are installed, available, uninstalled or updatable\&.
 .SH "OPTIONS"
-.TP
-.B \-a, \-\-available
+.PP
+\fB\-a\fR, \fB\-\-available\fR
+.RS 4
 List all bee packages available for installation matching
-.IR <pattern> .
-.TP
-.B \-\-exact, \-\-by\-pkgfullname
+\fI<pattern>\fR\&.
+.RE
+.PP
+\fB\-\-exact\fR, \fB\-\-by\-pgkfullname\fR
+.RS 4
 Use this option, if you want
-.I <pattern>
-to match the full package name.
-.TP
-.B \-i, \-\-installed
+\fI<pattern>\fR
+to match the full package name\&.
+.RE
+.PP
+\fB\-i\fR, \fB\-\-installed\fR
+.RS 4
 List all installed bee packages matching
-.IR <pattern> .
-.br
-This is the default.
-.TP
-.B \-u, \-\-updatable
-List all packages that can be updated.
-.TP
-.B \-U, \-\-uninstalled
-List all uninstalled packages.
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
+\fI<pattern>\fR\&. This is the default\&.
+.RE
+.PP
+\fB\-u\fR, \fB\-\-updatable\fR
+.RS 4
+List all packages that can bee updated\&.
+.RE
+.PP
+\fB\-U\fR, \fB\-\-uninstalled\fR
+.RS 4
+List all uninstalled packages\&.
+.RE
+.PP
+\fB\-\-display\-pathname\fR
+.RS 4
+Show pathname when listing available packages\&.
+.RE
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_METADIR
+.PP
+\fBBEE_METADIR\fR
+.RS 4
 Directory searched for installed bee packages
-.TP
-.B BEE_PKGDIR
+.RE
+.PP
+\fBBEE_PKGDIR\fR
+.RS 4
 Directory searched for available bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-list.xml b/manpages/bee-list.xml
new file mode 100644
index 0000000..ad1c9d8
--- /dev/null
+++ b/manpages/bee-list.xml
@@ -0,0 +1,186 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-list
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-list">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-list</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-list</refname>
+                <refpurpose>List bee packages</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee list</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;pattern&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para><command>bee-list</command> is used to display all bee packages that
+                are installed, available, uninstalled or updatable.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-a</option></term>
+                                <term><option>--available</option></term>
+
+                                <listitem><para>
+                                List all bee packages available for installation matching
+                                <replaceable>&lt;pattern&gt;</replaceable>.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--exact</option></term>
+                                <term><option>--by-pgkfullname</option></term>
+
+                                <listitem><para>
+                                Use this option, if you want <replaceable>&lt;pattern&gt;</replaceable>
+                                to match the full package name.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-i</option></term>
+                                <term><option>--installed</option></term>
+
+                                <listitem><para>
+                                List all installed bee packages matching
+                                <replaceable>&lt;pattern&gt;</replaceable>.
+                                This is the default.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-u</option></term>
+                                <term><option>--updatable</option></term>
+
+                                <listitem><para>
+                                List all packages that can bee updated.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-U</option></term>
+                                <term><option>--uninstalled</option></term>
+
+                                <listitem><para>
+                                List all uninstalled packages.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--display-pathname</option></term>
+
+                                <listitem><para>Show pathname when listing available packages.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_METADIR</option></term>
+                        <listitem><para>Directory searched for installed bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_PKGDIR</option></term>
+                        <listitem><para>Directory searched for available bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-query.1.in b/manpages/bee-query.1.in
index e379f6e..5a0c9b2 100644
--- a/manpages/bee-query.1.in
+++ b/manpages/bee-query.1.in
@@ -1,87 +1,72 @@
-." manpage of bee-query
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-query" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-query
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-QUERY" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-query \- Ask the bee database for files and packages
-
+bee-query \- Ask the bee database for files and packages
 .SH "SYNOPSIS"
-.SY "bee query"
-.OP options
-.I <pattern>
-.YS
-
+.HP \w'\fBbee\ query\fR\ 'u
+\fBbee query\fR [options] \fI<pattern>\fR
 .SH "DESCRIPTION"
-.P
+.PP
 Use
-.B bee-query
+\fBbee\-query\fR
 to ask the bee database for
-.IR <pattern> .
-If
-.I <pattern>
-matches the full name of an installed package, all related files, otherwise all
-matching files and the related packages will be displayed.
-
+\fI<pattern>\fR\&. If
+\fI<pattern>\fR
+matches the full name of an installed package, all related files, otherwise all matching files and the related packages will be displayed\&.
 .SH "OPTIONS"
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_METADIR
-.RS
+.PP
+\fBBEE_METADIR\fR
+.RS 4
 Directory searched for installed bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-query.xml b/manpages/bee-query.xml
new file mode 100644
index 0000000..2848637
--- /dev/null
+++ b/manpages/bee-query.xml
@@ -0,0 +1,128 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-query
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-query">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-query</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-query</refname>
+                <refpurpose>Ask the bee database for files and packages</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee query</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;pattern&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>
+                Use <command>bee-query</command> to ask the bee database for
+                <replaceable>&lt;pattern&gt;</replaceable>. If
+                <replaceable>&lt;pattern&gt;</replaceable> matches the full name of an
+                installed package, all related files, otherwise all matching files and the
+                related packages will be displayed.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_METADIR</option></term>
+                        <listitem><para>Directory searched for installed bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee-remove.1.in b/manpages/bee-remove.1.in
index 03726a9..4b92c48 100644
--- a/manpages/bee-remove.1.in
+++ b/manpages/bee-remove.1.in
@@ -1,88 +1,76 @@
-." manpage of bee-remove
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee-remove" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee-remove
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE\-REMOVE" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
-bee\-remove \- Remove an installed bee package
-
+bee-remove \- Remove an installed bee package
 .SH "SYNOPSIS"
-.SY "bee remove"
-.OP options
-.I <bee-package>
-.YS
-
+.HP \w'\fBbee\ remove\fR\ 'u
+\fBbee remove\fR [options] \fI<bee\-package>\fR
 .SH "DESCRIPTION"
-.P
+.PP
 Use
-.B bee-remove
-to remove installed bee packages. If
-.I <bee-package>
-does not match the full name of a bee package, all matching packages will be displayed.
-
+\fBbee\-remove\fR
+to remove installed bee packages\&. If
+\fI<bee\-package>\fR
+does not match the full name of a bee package, all matching packages will be displayed\&.
 .SH "OPTIONS"
-.TP
-.B \-h, \-\-help
-Print a little help screen.
-
-.TP
-.B \-v, \-\-verbose
-Print removed files and directories.
-
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
+.PP
+\fB\-v\fR, \fB\-\-verbose\fR
+.RS 4
+Print removed files and directories\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_METADIR
-.RS
+.PP
+\fBBEE_METADIR\fR
+.RS 4
 Directory searched for installed bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee\fR(1),
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee-remove.xml b/manpages/bee-remove.xml
new file mode 100644
index 0000000..f6cf559
--- /dev/null
+++ b/manpages/bee-remove.xml
@@ -0,0 +1,133 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee-remove
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee-remove">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee-remove</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee-remove</refname>
+                <refpurpose>Remove an installed bee package</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee remove</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;bee-package&gt;</replaceable></arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>
+                Use <command>bee-remove</command> to remove installed bee packages.
+                If <replaceable>&lt;bee-package&gt;</replaceable> does not match
+                the full name of a bee package, all matching packages will be displayed.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-v</option></term>
+                                <term><option>--verbose</option></term>
+
+                                <listitem><para>Print removed files and directories.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_METADIR</option></term>
+                        <listitem><para>Directory searched for installed bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>
diff --git a/manpages/bee.1.in b/manpages/bee.1.in
index 81b445e..c500a46 100644
--- a/manpages/bee.1.in
+++ b/manpages/bee.1.in
@@ -1,108 +1,103 @@
-." manpage of bee
-."
-." Copyright (C) 2009-2012
-."       Marius Tolzmann <tolzmann@molgen.mpg.de>
-."       Tobias Dreyer <dreyer@molgen.mpg.de>
-."       and other bee developers
-."
-." This file is part of bee.
-."
-." bee is free software; you can redistribute it and/or modify
-." it under the terms of the GNU General Public License as published by
-." the Free Software Foundation, either version 3 of the License, or
-." (at your option) any later version.
-."
-." program is distributed in the hope that it will be useful,
-." but WITHOUT ANY WARRANTY; without even the implied warranty of
-." MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-." GNU General Public License for more details.
-."
-." You should have received a copy of the GNU General Public License
-." along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-.TH "bee" "1" "2012-08-31" "bee @BEE_VERSION@" "bee - bau et einfach"
-
+'\" t
+.\"     Title: bee
+.\"    Author: Marius Tolzmann <tolzmann@molgen.mpg.de>
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 04/24/2013
+.\"    Manual: bee - bau et einfach
+.\"    Source: bee @BEE_VERSION@
+.\"  Language: English
+.\"
+.TH "BEE" "1" "04/24/2013" "bee @BEE_VERSION@" "bee - bau et einfach"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
 .SH "NAME"
 bee \- Run a bee tool
-
 .SH "SYNOPSIS"
-.SY "bee "
-.OP options
-.I <command>
-.OP args
-.YS
-
+.HP \w'\fBbee\fR\ 'u
+\fBbee\fR [options] \fI<tool>\fR [tool\-options] [tool\-arguments]
 .SH "DESCRIPTION"
-.P
-.B bee
-is a wrapper tool that is used to run all bee tools. All options known by these bee tools can be passed
-to
-.BR bee .
+.PP
 
+\fBbee\fR
+is a wrapper tool that is used to run all bee tools\&. All options known by these bee tools can bee passed to
+\fBbee\fR\&.
 .SH "OPTIONS"
-.TP
-.B \-\-destdir <BEE_BEEDESTDIR>
+.PP
+\fB\-\-destdir <BEE_BEEDESTDIR>\fR
+.RS 4
 Run
-.B bee
+\fBbee\fR
 as if
-.B BEE_BEEDESTDIR
-is your system's root directory. That means
-.B BEE_BEEDESTDIR
+\fBBEE_BEEDESTDIR\fR
+is your system\'s root directory\&. That means
+\fBBEE_BEEDESTDIR\fR
 is prepended to
-.B BEE_METADIR
+\fBBEE_METADIR\fR
 and
-.B BEE_CACHEDIR
+\fBBEE_CACHEDIR\fR
 and in case you run
-.BR bee\-install (1)
+\fBbee-install\fR(1)
 all files are extracted under
-.BR BEE_BEEDESTDIR .
-.TP
-.B \-\-print-config
-Dispays all bee relevant variables.
-.TP
-.B \-\-h, \-\-help
-Prints a little help screen and all available commands.
-.TP
-.B \-V, \-\-version
-Prints bee's version.
-
+\fBBEE_BEEDESTDIR\fR\&.
+.RE
+.PP
+\fB\-\-print\-config\fR
+.RS 4
+Displays all bee relevant variables\&.
+.RE
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Print a usage message\&.
+.RE
+.PP
+\fB\-V\fR, \fB\-\-version\fR
+.RS 4
+Print bee\'s version\&.
+.RE
 .SH "ENVIRONMENT"
-.TP
-.B BEE_METADIR
+.PP
+\fBBEE_METADIR\fR
+.RS 4
 Directory searched for installed bee packages
-.TP
-.B BEE_PKGDIR
+.RE
+.PP
+\fBBEE_PKGDIR\fR
+.RS 4
 Directory searched for available bee packages
+.RE
+.SH "BUGS"
+.PP
+Please report bugs to bee\-dev@googlegroups\&.com or directly to the authors\&.
+.SH "SEE ALSO"
+.PP
 
+\fBbee-check\fR(1),
+\fBbee-download\fR(1),
+\fBbee-init\fR(1),
+\fBbee-install\fR(1),
+\fBbee-list\fR(1),
+\fBbee-query\fR(1),
+\fBbee-remove\fR(1),
+\fBbee-update\fR(1)
 .SH "AUTHORS"
-.P
-.MT tolzmann@molgen.mpg.de
-Marius Tolzmann
-.ME
-.br
-.MT dreyer@molgen.mpg.de
-Tobias Dreyer
-.ME
-.br
-.MT ruester@molgen.mpg.de
-Matthias Ruester
-.ME
-.br
-and other bee developers
-
-.SH "BEE"
-.P
-This file is part of bee.
-.P
-Please report bugs to bee-dev@googlegroups.com or directly to the authors.
-
-.SH "SEE ALSO"
-.BR bee (1)
-.BR bee\-check (1)
-.BR bee\-download (1)
-.BR bee\-init (1)
-.BR bee\-install (1)
-.BR bee\-list (1)
-.BR bee\-query (1)
-.BR bee\-remove (1)
-.BR bee\-update (1)
+.PP
+\fBMarius Tolzmann\fR <\&tolzmann@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBTobias Dreyer\fR <\&dreyer@molgen\&.mpg\&.de\&>
+.RS 4
+.RE
+.PP
+\fBand other bee developers\fR
+.RS 4
+.RE
diff --git a/manpages/bee.xml b/manpages/bee.xml
new file mode 100644
index 0000000..508f8d0
--- /dev/null
+++ b/manpages/bee.xml
@@ -0,0 +1,161 @@
+<?xml version='1.0'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+    manpage of bee
+
+    Copyright (C) 2013
+          Lena Kristin Zander <zander@molgen.mpg.de>
+
+    This file is part of bee.
+
+    bee is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<refentry id="bee">
+        <refentryinfo>
+                <title>bee - bau et einfach</title>
+                <productname>bee @BEE_VERSION@</productname>
+
+                <authorgroup>
+                    <author>
+                        <contrib></contrib> <!-- prevent warning -->
+                        <firstname>Marius</firstname>
+                        <surname>Tolzmann</surname>
+                        <email>tolzmann@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>Tobias</firstname>
+                        <surname>Dreyer</surname>
+                        <email>dreyer@molgen.mpg.de</email>
+                    </author>
+
+                    <author>
+                        <contrib></contrib>
+                        <firstname>and other bee developers</firstname>
+                    </author>
+                </authorgroup>
+        </refentryinfo>
+
+        <refmeta>
+                <refentrytitle>bee</refentrytitle>
+                <manvolnum>1</manvolnum>
+        </refmeta>
+
+        <refnamediv>
+                <refname>bee</refname>
+                <refpurpose>Run a bee tool</refpurpose>
+        </refnamediv>
+
+        <refsynopsisdiv>
+                <cmdsynopsis>
+                        <command>bee</command>
+                        <arg choice="opt">options</arg>
+                        <arg choice="plain"><replaceable>&lt;tool&gt;</replaceable></arg>
+                        <arg choice="opt">tool-options</arg>
+                        <arg choice="opt">tool-arguments</arg>
+                </cmdsynopsis>
+        </refsynopsisdiv>
+
+        <refsect1>
+                <title>Description</title>
+
+                <para>
+                <command>bee</command> is a wrapper tool that is used to run all bee tools.
+                All options known by these bee tools can bee passed to <command>bee</command>.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>Options</title>
+
+                <variablelist>
+                        <varlistentry>
+                                <term><option>--destdir &lt;BEE_BEEDESTDIR&gt;</option></term>
+
+                                <listitem><para>
+                                Run <command>bee</command> as if <command>BEE_BEEDESTDIR</command>
+                                is your system's root directory. That means
+                                <command>BEE_BEEDESTDIR</command> is prepended to
+                                <command>BEE_METADIR</command> and <command>BEE_CACHEDIR</command>
+                                and in case you run
+                                <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                                all files are extracted under <command>BEE_BEEDESTDIR</command>.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>--print-config</option></term>
+
+                                <listitem><para>
+                                Displays all bee relevant variables.
+                                </para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-h</option></term>
+                                <term><option>--help</option></term>
+
+                                <listitem><para>Print a usage message.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><option>-V</option></term>
+                                <term><option>--version</option></term>
+
+                                <listitem><para>Print bee's version.</para></listitem>
+                        </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Environment</title>
+
+                <variablelist>
+                    <varlistentry>
+                        <term><option>BEE_METADIR</option></term>
+                        <listitem><para>Directory searched for installed bee packages</para></listitem>
+                    </varlistentry>
+
+                    <varlistentry>
+                        <term><option>BEE_PKGDIR</option></term>
+                        <listitem><para>Directory searched for available bee packages</para></listitem>
+                    </varlistentry>
+                </variablelist>
+        </refsect1>
+
+        <refsect1>
+                <title>Bugs</title>
+                <para>
+                Please report bugs to bee-dev@googlegroups.com or directly to the authors.
+                </para>
+        </refsect1>
+
+        <refsect1>
+                <title>See Also</title>
+                <para>
+                        <citerefentry><refentrytitle>bee-check</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-download</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-init</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-install</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-list</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-query</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-remove</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+                        <citerefentry><refentrytitle>bee-update</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+                </para>
+        </refsect1>
+</refentry>