diff --git a/bin/xbps-checkvers/xbps-checkvers.8 b/bin/xbps-checkvers/xbps-checkvers.8
index c83c0d3c..5785b0d4 100644
--- a/bin/xbps-checkvers/xbps-checkvers.8
+++ b/bin/xbps-checkvers/xbps-checkvers.8
@@ -1,4 +1,4 @@
-.Dd April 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-checkvers 8
 .Sh NAME
@@ -46,6 +46,7 @@ Shows missing binary packages comparing against the
 tree.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh SEE ALSO
 .Xr xbps-create 8 ,
 .Xr xbps-dgraph 8 ,
diff --git a/bin/xbps-create/xbps-create.8 b/bin/xbps-create/xbps-create.8
index 6192363d..6c54bbed 100644
--- a/bin/xbps-create/xbps-create.8
+++ b/bin/xbps-create/xbps-create.8
@@ -1,4 +1,4 @@
-.Dd May 29, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-create 8
 .Sh NAME
@@ -78,6 +78,7 @@ A list of provided shared libraries, separated by whitespaces. Example:
 .It Fl -shlib-requires Ar list
 A list of required shared libraries, separated by whitespaces. Example:
 .Ar 'libz.so.1 libfoo.so.2' .
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-dgraph 8 ,
diff --git a/bin/xbps-install/xbps-install.8 b/bin/xbps-install/xbps-install.8
index b67bb93c..944ebb1b 100644
--- a/bin/xbps-install/xbps-install.8
+++ b/bin/xbps-install/xbps-install.8
@@ -1,4 +1,4 @@
-.Dd August 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-install 8
 .Sh NAME
@@ -54,6 +54,7 @@ greater or equal than
 Example:
 .Dq Sy foo>=2.0 .
 The first package matching expression in a repository will be choosen.
+.El
 .Sh OPTIONS
 .Bl -tag -width -x
 .It Fl A, Fl -automatic
@@ -94,6 +95,7 @@ Enables verbose messages.
 Assume yes to all questions and avoid interactive questions.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width XBPS_TARGET_ARCH
 .It Sy XBPS_ARCH
@@ -107,6 +109,7 @@ Sets the target architecture to this value. This variable differs from
 in that it allows you to install packages partially, because
 configuration phase is skipped (the target binaries might not be compatible with
 the native architecture).
+.El
 .Sh FILES
 .Bl -tag -width /var/db/xbps/.<pkgname>.plist
 .It Ar /etc/xbps/xbps.conf
@@ -117,6 +120,7 @@ Package metadata properties.
 Default package database (0.21 format). Keeps track of installed packages and properties.
 .It Ar /var/cache/xbps
 Default cache directory to store downloaded binary packages.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,
diff --git a/bin/xbps-pkgdb/xbps-pkgdb.8 b/bin/xbps-pkgdb/xbps-pkgdb.8
index e3f912d4..ae670746 100644
--- a/bin/xbps-pkgdb/xbps-pkgdb.8
+++ b/bin/xbps-pkgdb/xbps-pkgdb.8
@@ -1,4 +1,4 @@
-.Dd April 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-pkgdb 8
 .Sh NAME
@@ -32,6 +32,7 @@ Checks that the package database does not contain obsolete data from previous
 XBPS versions and removes them if found.
 .It Sy FORMAT CONVERSION
 Updates the pkgdb format to the latest version.
+.El
 .Sh OPTIONS
 .Bl -tag -width -x
 .It Fl a, Fl -all
@@ -64,6 +65,7 @@ automatically. Usually this is needed only in rare circumstances.
 Enables verbose messages.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh FILES
 .Bl -tag -width /var/db/xbps/.<pkgname>.plist
 .It Ar /etc/xbps/xbps.conf
@@ -74,6 +76,7 @@ Package metadata properties.
 Default package database (0.21 format). Keeps track of installed packages and properties.
 .It Ar /var/cache/xbps
 Default cache directory to store downloaded binary packages.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,
diff --git a/bin/xbps-query/xbps-query.8 b/bin/xbps-query/xbps-query.8
index 8c9a02a0..9159831e 100644
--- a/bin/xbps-query/xbps-query.8
+++ b/bin/xbps-query/xbps-query.8
@@ -1,4 +1,4 @@
-.Dd August 19, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-query 8
 .Sh NAME
@@ -51,6 +51,7 @@ greater or equal than
 Example:
 .Dq Sy foo>=2.0 .
 The first package matching expression in a repository will be choosen.
+.El
 .Sh OPTIONS
 .Bl -tag -width -x
 .It Fl C, Fl -config Ar file
@@ -206,6 +207,7 @@ If the
 option is set, the matched
 .Ar PKG
 in repositories will be shown.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width XBPS_TARGET_ARCH
 .It Sy XBPS_ARCH
@@ -219,6 +221,7 @@ Sets the target architecture to this value. This variable differs from
 in that it allows you to install packages partially, because
 configuration phase is skipped (the target binaries might not be compatible with
 the native architecture).
+.El
 .Sh FILES
 .Bl -tag -width /var/db/xbps/.<pkgname>.plist
 .It Ar /etc/xbps/xbps.conf
@@ -229,6 +232,7 @@ Package metadata properties.
 Default package database (0.21 format). Keeps track of installed packages and properties.
 .It Ar /var/cache/xbps
 Default cache directory to store downloaded binary packages.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,
diff --git a/bin/xbps-reconfigure/xbps-reconfigure.8 b/bin/xbps-reconfigure/xbps-reconfigure.8
index 7aeafc67..f44928bc 100644
--- a/bin/xbps-reconfigure/xbps-reconfigure.8
+++ b/bin/xbps-reconfigure/xbps-reconfigure.8
@@ -1,4 +1,4 @@
-.Dd April 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-reconfigure 8
 .Sh NAME
@@ -50,6 +50,7 @@ Specifies a full path for the target root directory.
 Enables verbose messages.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh FILES
 .Bl -tag -width /var/db/xbps/.<pkgname>.plist
 .It Ar /etc/xbps/xbps.conf
@@ -60,6 +61,7 @@ Package metadata properties.
 Default package database (0.21 format). Keeps track of installed packages and properties.
 .It Ar /var/cache/xbps
 Default cache directory to store downloaded binary packages.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,
diff --git a/bin/xbps-remove/xbps-remove.8 b/bin/xbps-remove/xbps-remove.8
index d267d48f..74fe07d5 100644
--- a/bin/xbps-remove/xbps-remove.8
+++ b/bin/xbps-remove/xbps-remove.8
@@ -1,4 +1,4 @@
-.Dd April 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-remove 8
 .Sh NAME
@@ -91,6 +91,7 @@ Enables verbose messages.
 Assume yes to all questions and avoid interactive questions.
 .It Fl V, Fl -version
 Shows the XBPS version.
+.El
 .Sh FILES
 .Bl -tag -width /var/db/xbps/.<pkgname>.plist
 .It Ar /etc/xbps/xbps.conf
@@ -101,6 +102,7 @@ Package metadata properties.
 Default package database (0.21 format). Keeps track of installed packages and properties.
 .It Ar /var/cache/xbps
 Default cache directory to store downloaded binary packages.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,
diff --git a/bin/xbps-rindex/xbps-rindex.8 b/bin/xbps-rindex/xbps-rindex.8
index 149ce007..59167956 100644
--- a/bin/xbps-rindex/xbps-rindex.8
+++ b/bin/xbps-rindex/xbps-rindex.8
@@ -1,4 +1,4 @@
-.Dd April 21, 2014
+.Dd August 23, 2014
 .Os Void Linux
 .Dt xbps-rindex 8
 .Sh NAME
@@ -49,6 +49,7 @@ Signs a repository with your specified RSA key. If
 .Fl --privkey
 argument not set, it defaults to
 .Sy ~/.ssh/id_rsa .
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width XBPS_TARGET_ARCH
 .It Sy XBPS_ARCH
@@ -65,6 +66,7 @@ the native architecture).
 .It Sy XBPS_PASSPHRASE
 If this is set, it will use this passphrase for the RSA private key when signing
 a repository. Otherwise it will ask you to enter the passphrase on the terminal.
+.El
 .Sh SEE ALSO
 .Xr xbps-checkvers 8 ,
 .Xr xbps-create 8 ,