diff --git a/Makefile b/Makefile
index 69a437c..6f34565 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ HELPER_HOOKS_SHELL=update-mime-database glib-compile-schemas mkfontdir-mkfontsca
                    ldconfig update-desktop-database gdk-pixbuf-query-loaders mandb systemd-tmpfiles \
                    gconf-install-schemas info-dir
 
-MANPAGES=bee.1 bee-check.1 bee-init.1 bee-install.1 bee-list.1 bee-query.1 bee-remove.1 bee-dep.1
+MANPAGES=bee.1 bee-check.1 bee-init.1 bee-install.1 bee-list.1 bee-query.1 bee-remove.1 bee-dep.1 \
+         bee-update.1 bee-download.1
 
 CONFIG_TEMPLATES=fallback
 CONFIG_FILES=skiplist beerc
diff --git a/manpages/bee-check.1.in b/manpages/bee-check.1.in
index fd1f354..0e14e54 100644
--- a/manpages/bee-check.1.in
+++ b/manpages/bee-check.1.in
@@ -1,76 +1,80 @@
-.TH "bee-check" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-check" "1" "2012-05-16" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-check \- Perform some consistency checks on a bee package
+
 .SH "SYNOPSIS"
 .SY "bee check"
-.OP \-dfh
-.I pattern
+.OP options
+.I <pattern>
 .YS
+
 .SH "DESCRIPTION"
 .P
 .B bee-check
-is used to perform consistency checks on a bee package and shows missing link targets,
-missing files and directories or changed md5 sums.
+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.
+
 .SH "OPTIONS"
 .TP
-.B \-d
+.B \-\-dependencies
 .TQ
 .B \-\-deps
+.TQ
+.B \-d
 Print package's dependencies
 .TP
-.B \-f
-.TQ
 .B \-\-force
-Use
+.TQ
 .B \-f
+Use
+.B \-\-force
 to check all packages matching
-.IR  pattern ,
+.IR <pattern> ,
 if it does not match a full packagename.
 .TP
-.B \-h
-.TQ
 .B \-\-help
-Print a little help screen.
-.TP
-.B \-v
-.TQ
-.B \-\-verbose
-bee more verbose (can be used twice e.g. -vv)
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
 .TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-check 's
-environment variables.
+.B \-h
+Print a little help screen.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_METADIR
 .RS
 Directory searched for installed bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/share/bee
-.TQ
-other:     ~/.local/share/bee
-.RE
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-init (1)
-.BR bee-install (1)
-.BR bee-list (1)
-.BR bee-query (1)
-.BR bee-remove (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-dep.1.in b/manpages/bee-dep.1.in
index 14376d1..529accb 100644
--- a/manpages/bee-dep.1.in
+++ b/manpages/bee-dep.1.in
@@ -1,142 +1,86 @@
-.de Vb
-.ft CW
-.nf
-..
-.de Ve
-.ft R
+.TH "bee\-dep" "1" "2012-05-16" "bee @BEE_VERSION@" "bee - bau et einfach"
 
-.fi
-..
-.TH "bee\-dep" "1" "2012-01-26" "bee @BEE_VERSION@" "bee package management"
-.SH NAME
-
-.PP
+.SH "NAME"
 bee\-dep \- bee dependency tool
-.PP
-.SH SYNOPSIS
 
-\fBbee dep\fP
-<command> [pkgname|file]
-.PP
-.SH DESCRIPTION
+.SH "SYNOPSIS"
+.SY "bee dep"
+<command>
+.OP <args>
+.YS
 
-\fBbee\-dep\fP
-reads the
-.ul
-DEPENDENCIES
-file
-of every installed package and is able to query several information about the packages.
-.br
-.PP
-As part of the bee package management \fBbee\-dep\fP
-is invoked by the wrapper tool \fBbee\fP(1).
-.PP
-.SH COMMANDS
+.SH "DESCRIPTION"
+.B bee\-dep
+reads the DEPENDENCIES file of every installed package and is able to query several information about the packages.
 
-.PP
-\fBrebuild\fP
-.RS
-Rebuild the cache. Therefore the old cache is deleted and then recreated with the information of the
-.ul
-DEPENDENCIES
-file of each installed package.
-.RS
-.PP
-.RE
-.RE
-.PP
-\fBupdate\fP
-\fIpkgname\fP
-.RS
+.SH "COMMANDS"
+.TP
+.B rebuild
+Rebuild the cache. Therefore the old cache is deleted and then recreated with the information of the DEPENDENCIES file of each installed package.
+.SY update
+.OP pkgname
+.YS
 Update the cache for a specific package.
-.PP
-.RE
-.RE
-.PP
-\fBremove\fP
-[options] \fIpkgname\fP
-.RS
+.SY remove
+.OP options
+.I <pkgname>
+.YS
 Remove a package from the cache.
-.PP
-.RE
-.RE
-.PP
-\fBlist\fP
-[options] \fIpkgname\fP
-.RS
+.SY list
+.OP options
+.OP pkgname
+.YS
 Query information about a package.
-.PP
-.RE
-.RE
-.PP
-\fBconflicts\fP
-.RS
+.TP
+.B conflicts
 Show conflicting packages.
-.PP
-.RE
-.RE
-.PP
-.SH FILES
-
-\fB/etc/bee/beerc\fP
-.br
-\fB${HOME}/.beerc\fP
-.RS
-The main config files. Use these to change \fBbee\-dep\fP\&'s
-environment variables.
-.RE
-.RE
-.PP
-.SH ENVIRONMENT
 
-\fB${BEE_METADIR}\fP
-.br
-.RS
+.SH "ENVIRONMENT"
+.TP
+BEE_METADIR
 Directory where to search for installed bee packages
-.br
-.PP
-root\-user: /usr/share/bee
-.br
-other: ${HOME}/.local/share/beemeta
-.br
-.RE
-.RE
-.PP
-\fB${BEE_CACHEDIR}\fP
-.br
-.RS
-Directory where to save the cache file
-.ul
-index.db
+.TP
+BEE_CACHEDIR
+Directory where to save and read the cache file
+.I index.db
 and
 the lock file
-.ul
-index.lock
+.I index.lock
 
+.SH "AUTHORS"
+.P
+.MT ruester@molgen.mpg.de
+Matthias Ruester
+.ME
 .br
-root\-user: /var/cache/bee
-.br
-other: ${HOME}/.cache/bee
+.MT schwass@molgen.mpg.de
+Lucas Schwass
+.ME
 .br
-.RE
-.RE
-.PP
-.SH AUTHORS
-
-Matthias Ruester <\fBruester@molgen.mpg.de\fP>
-.br
-Lucas Schwass <\fBschwass@molgen.mpg.de\fP>
+.MT tolzmann@molgen.mpg.de
+Marius Tolzmann
+.ME
 .br
-Marius Tolzmann <\fBtolzmann@molgen.mpg.de\fP>
+.MT dreyer@molgen.mpg.de
+Tobias Dreyer
+.ME
 .br
-Tobias Dreyer <\fBdreyer@molgen.mpg.de\fP>
-.PP
-.SH SEE ALSO
+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.
 
-\fBbee\fP(1)
-\fBbee\-init\fP(1)
-\fBbee\-check\fP(1)
-\fBbee\-install\fP(1)
-\fBbee\-list\fP(1)
-\fBbee\-query\fP(1)
-\fBbee\-remove\fP(1)
+.SH "SEE ALSO"
+.BR bee (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-download.1.in b/manpages/bee-download.1.in
new file mode 100644
index 0000000..0e878ff
--- /dev/null
+++ b/manpages/bee-download.1.in
@@ -0,0 +1,75 @@
+.TH "bee-download" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
+.SH "NAME"
+bee\-download \- Download a repository and convert it into a source tarball
+
+.SH "SYNOPSIS"
+.SY "bee download"
+.OP options
+.I <repository-url>
+.YS
+
+.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" .
+
+.SH "OPTIONS"
+.TP
+.BI \-\-pkgname " <name>"
+Specifiy the tarballs package name.
+.TP
+.BI \-\-pkgversion " <version>"
+Specifiy the tarballs package version.
+.TP
+.BI \-\-commit " <rev>"
+Use a certain
+.I <rev>
+as HEAD revision.
+.TP
+.B \-\-help
+.TQ
+.B \-h
+Print a little help screen.
+
+.SH "ENVIRONMENT"
+.TP
+.B BEE_DOWNLOADDIR
+.RS
+The source tarball is placed here.
+
+.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\-dep (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)
diff --git a/manpages/bee-init.1.in b/manpages/bee-init.1.in
index 25bf9c4..28ec636 100644
--- a/manpages/bee-init.1.in
+++ b/manpages/bee-init.1.in
@@ -1,65 +1,64 @@
-.TH "bee-init" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-init" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-init \- Create a bee file for building a bee package
+
 .SH "SYNOPSIS"
 .SY "bee init"
-.OP \-fh
-.OP \-\-configure mode
-.OP \-\-disable-versionify
-.OP \-t template
-.I url-to-file
+.OP options
+.I <url-to-sources>
+.OP "-- configure options" 
 .YS
+
 .SH "DESCRIPTION"
 .P
 .B bee-init
 is used to create a file, that is run in order to build a bee package.
+
 .SH "OPTIONS"
 .TP
-.BI \-\-configure " mode"
-Set
-.I mode
-to 'compat' if DATAROOTDIR is not supported in your build process
+.BI \-\-configure " <mode>"
+Set <mode> to 'compat' if DATAROOTDIR is not supported in your build process
 .TP
-.BI \-\-buildtype " TYPE"
+.BI \-\-buildtype " <type>"
 force buildtype: configure, cmake, make, autogen, perl-module, perl-module-makemaker, python-module
 .TP
 .B \-\-disable-versionify
 Enable this flag, if you do not want that version numbers in your source url are substituted for
 bee variables.
 .TP
-.BI -t " template"
+.BI --template " <template>"
 .TQ
-.BI --template " template"
-Create bee file with template
-.IR template .
+.BI -t " <template>"
+Create bee file with template <template>.
 .TP
-.B \-f
-.TQ
 .B \-\-force
+.TQ
+.B \-f
 Normally
 .B bee-init
 warns you, if that bee file you want to create already exists. Use
-.B \-f
+.B \-\-force
 to ignore the warning and override the old file.
 .TP
-.B \-h
-.TQ
 .B \-\-help
+.TQ
+.B \-h
 Print a little help screen.
 .TP
-.B \-V
-.TQ
 .B \-\-version
+.TQ
+.B \-v
 print version number
 .TP
-.B \-e
-.TQ
 .B \-\-execute
+.TQ
+.B \-e
 execute bee-file after creation
 .TP
-.B \-i
-.TQ
 .B \-\-install
+.TQ
+.B \-i
 execute bee-file and install software
 .TP
 .B \-\-prefix
@@ -94,29 +93,48 @@ execute bee-file and install software
 .TQ
 .B \-\-localedir
 Set these directories, if you do not want to install to the default locations.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
-.TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-init 's
-environment variables.
-.\" .SH "BUGS"
+
+.SH "CONFIGURE OPTIONS"
+.P
+Package specific configure options may be appended at the end of your bee-init line, e.g.
+.B bee init http://ftp.gnome.org/pub/gnome/sources/gtk+/3.5/gtk+-3.5.2.tar.xz
+.B -- --enable-introspection --enable-xinerama
+will automatically append
+.B --enable-introspection --enable-xinerama
+to the
+.B bee_configure
+call in your bee file.
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-install (1)
-.BR bee-list (1)
-.BR bee-query (1)
-.BR bee-remove (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-install.1.in b/manpages/bee-install.1.in
index ad39133..f941391 100644
--- a/manpages/bee-install.1.in
+++ b/manpages/bee-install.1.in
@@ -1,12 +1,14 @@
-.TH "bee-install" "1" "2011-08-11" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-install" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-install \- Install a bee package
+
 .SH "SYNOPSIS"
 .SY "bee install"
-.OP \-afhuv
-.OP \-\-noop
-.I bee-package
+.OP options
+.I <bee-package>
 .YS
+
 .SH "DESCRIPTION"
 .P
 .B bee-install
@@ -17,86 +19,83 @@ Normally
 searches
 .B BEE_PKGDIR
 for
-.I bee-package
+.I <bee-package>
 but you can use
-.BI /path/to/ bee-package .bee.tar.bz2
+.BI /path/to/ <bee-package> .bee.tar.bz2
 too.
+
 .SH "OPTIONS"
 .TP
-.B \-a
-.TQ
-.B \-\-all
+.B \-\-verbose
 .TQ
 .B \-v
-.TQ
-.B \-\-verbose
 Run
 .B bee-install
 in verbose mode.
 .TP
-.B \-f
-.TQ
 .B \-\-force
-Use
+.TQ
 .B \-f
+Use
+.B \-\-force
 to prevent
 .B bee-install
 from checking whether
-.I bee-package
+.I <bee-package>
 is already installed.
 .TP
-.B \-h
-.TQ
 .B \-\-help
+.TQ
+.B \-h
 Print a little help screen.
 .TP
-.B \-u
-.TQ
 .B \-\-update
-Install
-.I bee\-package
-and remove all other installed versions of this package.
-Downgrades are possible by forcing the installation of lower versions with the
-.B \-f
-option.
+.TQ
+.B \-u
+Update an install
+.IR <bee-package> .
 .TP
 .B \-\-noop
-Run bee in noop mode.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
-.TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-install 's
-environment variables.
+Run
+.B bee-install
+in noop mode.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_PKGDIR
 .RS
 Directory searched for available bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/src/bee/packages
-.TQ
-other:     ~/.local/src/bee/packages
-.RE
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-init (1)
-.BR bee-list (1)
-.BR bee-query (1)
-.BR bee-remove (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-list.1.in b/manpages/bee-list.1.in
index 786b152..ea4a4ff 100644
--- a/manpages/bee-list.1.in
+++ b/manpages/bee-list.1.in
@@ -1,85 +1,81 @@
-.TH "bee-list" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-list" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-list \- List installed and available bee packages
+
 .SH "SYNOPSIS"
 .SY "bee list"
-.OP \-ahi
-.OP \-\-by\-pkgfullname
-.I pattern
+.OP options
+.I <pattern>
 .YS
+
 .SH "DESCRIPTION"
 .P
 .B bee-list
 is used to display all bee packages that are installed or available for installation.
+
 .SH "OPTIONS"
 .TP
-.B \-a
-.TQ
 .B \-\-available
+.TQ
+.B \-a
 List all bee packages available for installation that match
-.IR pattern .
+.IR <pattern> .
 .TP
 .B \-\-by\-pkgfullname
 Use this flag, if you want that
-.I pattern
+.I <pattern>
 has to match the full packagename.
 .TP
-.B \-i
-.TQ
 .B \-\-installed
+.TQ
+.B \-i
 List all installed bee packages that match
-.IR pattern .
+.IR <pattern> .
 .TP
 .B \-h
 .TQ
 .B \-\-help
 Print a little help screen.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
-.TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-list 's
-environment variables.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_METADIR
-.RS
 Directory searched for installed bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/share/bee
-.TQ
-other:     ~/.local/share/bee
-.RE
 .TP
 .B BEE_PKGDIR
-.RS
 Directory searched for available bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/src/bee/packages
-.TQ
-other:     ~/.local/src/bee/packages
-.RE
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-init (1)
-.BR bee-install (1)
-.BR bee-query (1)
-.BR bee-remove (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-query.1.in b/manpages/bee-query.1.in
index 20bf5b7..6457710 100644
--- a/manpages/bee-query.1.in
+++ b/manpages/bee-query.1.in
@@ -1,73 +1,68 @@
-.TH "bee-query" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-query" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-query \- Ask the bee database for files and packages
+
 .SH "SYNOPSIS"
 .SY "bee query"
-.OP \-h
-.I pattern
+.OP options
+.I <pattern>
 .YS
+
 .SH "DESCRIPTION"
 .P
 Use
 .B bee-query
 to ask the bee database for
-.IR pattern .
+.IR <pattern> .
 If
-.I patten
+.I <pattern>
 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
-.TQ
 .B \-\-help
-Print a little help screen.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
 .TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-query 's
-environment variables.
+.B \-h
+Print a little help screen.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_METADIR
 .RS
 Directory searched for installed bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/share/bee
-.TQ
-other:     ~/.local/share/bee
-.RE
-.SH "DIAGNOSTICS"
-Following error message may be seen:
-.TP
-.B "BEE-ERROR: please call bee-query from bee .."
-.B bee-query
-must be run by the wrapper
-.BR bee .
-Just call
-.B bee query
-.OP options
-.I pattern
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-init (1)
-.BR bee-install (1)
-.BR bee-list (1)
-.BR bee-remove (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-remove.1.in b/manpages/bee-remove.1.in
index b88e8ea..0354082 100644
--- a/manpages/bee-remove.1.in
+++ b/manpages/bee-remove.1.in
@@ -1,77 +1,72 @@
-.TH "bee-remove" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee-remove" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee\-remove \- Remove an installed bee package
+
 .SH "SYNOPSIS"
 .SY "bee remove"
-.OP \-hn
-.I bee-package
+.OP options
+.I <bee-package>
 .YS
+
 .SH "DESCRIPTION"
 .P
 Use
 .B bee-remove
 to remove installed bee packages. If
-.I bee-package
+.I <bee-package>
 does not match the full name of a bee package, all matching packages will be displayed.
+
 .SH "OPTIONS"
 .TP
-.B \-h
-.TQ
 .B \-\-help
+.TQ
+.B \-h
 Print a little help screen.
 .TP
-.B \-n
-.TQ
 .B \-\-noop
+.TQ
+.B \-n
 Do not actually remove
-.IR bee-package ,
+.IR <bee-package> ,
 just print.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
-.TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee-remove 's
-environment variables.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_METADIR
 .RS
 Directory searched for installed bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/share/bee
-.TQ
-other:     ~/.local/share/bee
-.RE
-.SH "DIAGNOSTICS"
-Following error message may be seen:
-.TP
-.B "BEE-ERROR: please call bee-remove from bee .."
-.B bee-remove
-must be run by the wrapper
-.BR bee .
-Just call
-.B bee remove
-.OP options
-.I bee-package
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-init (1)
-.BR bee-install (1)
-.BR bee-list (1)
-.BR bee-query (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)
diff --git a/manpages/bee-update.1.in b/manpages/bee-update.1.in
new file mode 100644
index 0000000..8272162
--- /dev/null
+++ b/manpages/bee-update.1.in
@@ -0,0 +1 @@
+.so bee-install.1
\ No newline at end of file
diff --git a/manpages/bee.1.in b/manpages/bee.1.in
index c29d709..d67d34b 100644
--- a/manpages/bee.1.in
+++ b/manpages/bee.1.in
@@ -1,22 +1,22 @@
-.TH "bee" "1" "2011-07-25" "bee @BEE_VERSION@" "bee package management"
+.TH "bee" "1" "2012-05-18" "bee @BEE_VERSION@" "bee - bau et einfach"
+
 .SH "NAME"
 bee \- Run a bee tool
+
 .SH "SYNOPSIS"
 .SY "bee "
-.OP check
-.OP init
-.OP install
-.OP list
-.OP query
-.OP remove
-.I arguments
+.OP options
+.I <command>
+.OP args
 .YS
+
 .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 .
+
 .SH "OPTIONS"
 .TP
 .B \-\-destdir <BEE_BEEDESTDIR>
@@ -39,57 +39,53 @@ all files are extracted under
 Dispays all bee relevant variables.
 .TP
 .B \-\-help
-Prints a little help screen.
+.TQ
+.B \-h
+Prints a little help screen and all available commands.
 .TP
 .B \-\-version
-Prints bee's version.
-.SH "FILES"
-.TP
-.B /etc/bee/beerc
 .TQ
-.B ~/.beerc
-The main config files. Use these to change
-.BR bee 's
-environment variables.
+.B \-V
+Prints bee's version.
+
 .SH "ENVIRONMENT"
 .TP
 .B BEE_METADIR
-.RS
 Directory searched for installed bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/share/bee
-.TQ
-other:     ~/.local/share/bee
-.RE
 .TP
 .B BEE_PKGDIR
-.RS
 Directory searched for available bee packages
-.P
-Defaults:
-.TQ
-root-user: /usr/src/bee/packages
-.TQ
-other:     ~/.local/src/bee/packages
-.RE
-.\" .SH "DIAGNOSTICS"
-.\" .SH "BUGS"
+
 .SH "AUTHORS"
 .P
 .MT tolzmann@molgen.mpg.de
 Marius Tolzmann
 .ME
-.P
+.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 beesh (1)
-.BR bee-check (1)
-.BR bee-init (1)
-.BR bee-install (1)
-.BR bee-list (1)
-.BR bee-query (1)
-.BR bee-remove (1)
+.BR bee (1)
+.BR bee\-check (1) 
+.BR bee\-dep (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)