diff --git a/bin/xbps-checkvers/xbps-checkvers.8 b/bin/xbps-checkvers/xbps-checkvers.8
index 958d97ea..613428fd 100644
--- a/bin/xbps-checkvers/xbps-checkvers.8
+++ b/bin/xbps-checkvers/xbps-checkvers.8
@@ -1,6 +1,5 @@
-.Dd August 23, 2014
-.Os Void Linux
-.Dt xbps-checkvers 8
+.Dd September 30, 2014
+.Dt XBPS-CHECKVERS 8
 .Sh NAME
 .Nm xbps-checkvers
 .Nd XBPS utility to check for outdated packages
diff --git a/bin/xbps-create/xbps-create.8 b/bin/xbps-create/xbps-create.8
index f1b7f257..e0004713 100644
--- a/bin/xbps-create/xbps-create.8
+++ b/bin/xbps-create/xbps-create.8
@@ -1,6 +1,5 @@
-.Dd August 23, 2014
-.Os Void Linux
-.Dt xbps-create 8
+.Dd September 30, 2014
+.Dt XBPS-CREATE 8
 .Sh NAME
 .Nm xbps-create
 .Nd XBPS utility to create binary packages
diff --git a/bin/xbps-install/xbps-install.8 b/bin/xbps-install/xbps-install.8
index 0b828de1..d02de7ca 100644
--- a/bin/xbps-install/xbps-install.8
+++ b/bin/xbps-install/xbps-install.8
@@ -1,6 +1,5 @@
-.Dd September 12, 2014
-.Os Void Linux
-.Dt xbps-install 8
+.Dd September 30, 2014
+.Dt XBPS-INSTALL 8
 .Sh NAME
 .Nm xbps-install
 .Nd XBPS utility to (re)install and update packages
@@ -34,8 +33,8 @@ by exact package name and version, i.e:
 .Dq Sy foo-1.0_1 .
 .It
 by specifying a package name and version separated by any of the following version comparators:
-.Bl -item -width xx -compact
 .Pp
+.Bl -item -compact
 .It
 .Sy <
 less than
diff --git a/bin/xbps-pkgdb/xbps-pkgdb.8 b/bin/xbps-pkgdb/xbps-pkgdb.8
index ad27ee31..8ae96498 100644
--- a/bin/xbps-pkgdb/xbps-pkgdb.8
+++ b/bin/xbps-pkgdb/xbps-pkgdb.8
@@ -1,6 +1,5 @@
-.Dd September 11, 2014
-.Os Void Linux
-.Dt xbps-pkgdb 8
+.Dd September 30, 2014
+.Dt XBPS-PKGDB 8
 .Sh NAME
 .Nm xbps-pkgdb
 .Nd XBPS utility to report/fix issues and modify the package database (pkgdb)
diff --git a/bin/xbps-query/xbps-query.8 b/bin/xbps-query/xbps-query.8
index ea749426..806dcbd4 100644
--- a/bin/xbps-query/xbps-query.8
+++ b/bin/xbps-query/xbps-query.8
@@ -1,6 +1,5 @@
-.Dd September 28, 2014
-.Os Void Linux
-.Dt xbps-query 8
+.Dd September 30, 2014
+.Dt XBPS-QUERY 8
 .Sh NAME
 .Nm xbps-query
 .Nd XBPS utility to query for package and repository information
@@ -31,8 +30,8 @@ by exact package name and version, i.e:
 .Dq Sy foo-1.0_1 .
 .It
 by specifying a package name and version separated by any of the following version comparators:
-.Bl -item -width xx -compact
 .Pp
+.Bl -item -compact
 .It
 .Sy <
 less than
@@ -88,6 +87,7 @@ Specifies a full path for the target root directory.
 Enables verbose messages.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh MODE
 Only one of the following modes can be used at a time.
 By default and unless the
@@ -100,8 +100,8 @@ queried in registered repositories.
 .It Fl l, Fl -list-pkgs
 Lists registered packages in the package database (pkgdb).
 A package can be in any of the following states:
-.Bl -item -width xx -compact
 .Pp
+.Bl -item -compact
 .It
 .Sy ii
 Package is installed.
diff --git a/bin/xbps-reconfigure/xbps-reconfigure.8 b/bin/xbps-reconfigure/xbps-reconfigure.8
index c2c37b24..3ba8440f 100644
--- a/bin/xbps-reconfigure/xbps-reconfigure.8
+++ b/bin/xbps-reconfigure/xbps-reconfigure.8
@@ -1,6 +1,5 @@
-.Dd September 11, 2014
-.Os Void Linux
-.Dt xbps-reconfigure 8
+.Dd September 30, 2014
+.Dt XBPS-RECONFIGURE 8
 .Sh NAME
 .Nm xbps-reconfigure
 .Nd XBPS utility to configure installed packages
diff --git a/bin/xbps-remove/xbps-remove.8 b/bin/xbps-remove/xbps-remove.8
index e4eed7c0..fbff74a2 100644
--- a/bin/xbps-remove/xbps-remove.8
+++ b/bin/xbps-remove/xbps-remove.8
@@ -1,6 +1,5 @@
-.Dd September 11, 2014
-.Os Void Linux
-.Dt xbps-remove 8
+.Dd September 30, 2014
+.Dt XBPS-REMOVE 8
 .Sh NAME
 .Nm xbps-remove
 .Nd XBPS utility to remove packages
@@ -57,7 +56,6 @@ Package metadata file is removed.
 .Pp
 .Sy *
 Package is unregistered from package database.
-.Pp
 .Sh OPTIONS
 .Bl -tag -width -x
 .It Fl C, Fl -config Ar file
diff --git a/bin/xbps-rindex/xbps-rindex.8 b/bin/xbps-rindex/xbps-rindex.8
index 59167956..a18280e6 100644
--- a/bin/xbps-rindex/xbps-rindex.8
+++ b/bin/xbps-rindex/xbps-rindex.8
@@ -1,6 +1,5 @@
-.Dd August 23, 2014
-.Os Void Linux
-.Dt xbps-rindex 8
+.Dd September 30, 2014
+.Dt XBPS-RINDEX 8
 .Sh NAME
 .Nm xbps-rindex
 .Nd XBPS utility to manage local binary package repositories
@@ -30,8 +29,8 @@ This is required to sign a repository, a description of the person signing the r
 .It Sy --privkey Ar key
 Path to the private RSA key to sign the repository. If unset, defaults to
 .Sy ~/.ssh/id_rsa .
+.El
 .Sh MODE
-.Pp
 .Bl -tag -width x
 .It Sy -a, --add Ar repository/binpkg.xbps ...
 Registers the binary package into the local repository. The specified binary
diff --git a/bin/xbps-uchroot/xbps-uchroot.8 b/bin/xbps-uchroot/xbps-uchroot.8
index d21ba225..fa9625d2 100644
--- a/bin/xbps-uchroot/xbps-uchroot.8
+++ b/bin/xbps-uchroot/xbps-uchroot.8
@@ -1,6 +1,5 @@
-.Dd August 23, 2014
-.Os Void Linux
-.Dt xbps-uchroot 8
+.Dd September 30, 2014
+.Dt XBPS-UCHROOT 8
 .Sh NAME
 .Nm xbps-uchroot
 .Nd XBPS utility to chroot and bind mount with linux namespaces
@@ -51,7 +50,7 @@ The
 utility uses Linux specific features (namespaces) and it's not meant to be portable to
 other Operating Systems. The following kernel options must be enabled:
 .Pp
-.Bl -tag -compact -offset indent
+.Bl -tag -width CONFIG_NAMESPACES -compact -offset indent
 .It Sy CONFIG_NAMESPACES
 .It Sy CONFIG_IPC_NS
 .It Sy CONFIG_PID_NS