diff --git a/clear.1 b/clear.1
index d1ca88a..85b6ed6 100755
--- a/clear.1
+++ b/clear.1
@@ -1,5 +1,4 @@
-.Dd October 16, 2013
-.Dt CLEAR 1 1
-.Os Linux
-.Sh NAME
-.Nm clear - clear the screen
+.TH CLEAR 1 ubase\-VERSION
+.OS Linux
+.SH NAME
+clear \- clear the screen
diff --git a/df.1 b/df.1
index 527e6b4..1a220f0 100755
--- a/df.1
+++ b/df.1
@@ -1,26 +1,24 @@
-.Dd October 16, 2013
-.Dt DF 1 1
-.Os Linux
-.Sh NAME
-.Nm df
-.Nd show file system usage
-.Sh SYNOPSIS
-.Nm df
-.Op Fl ahis
-.Sh DESCRIPTION
+.TH DF 1 ubase\-VERSION
+.OS Linux
+.SH NAME
+df \- show file system usage
+.SH SYNOPSIS
+.B df
+.RB [ \-ahsi ]
+.SH DESCRIPTION
 df displays the amount of disk space available on a file system.
-.Pp
 If no arguments are given, df shows all the file systems using 512-byte
 blocks.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl a
+.SH OPTIONS
+.TP
+.BI \-a
 Show all file systems including dummy ones.
-.It Fl h
+.TP
+.BI \-h
 Not implemented.
-.It Fl s
+.TP
+.BI \-s
 Not implemented.
-.It Fl i
+.TP
+.BI \-i
 Not implemented.
-.El
diff --git a/eject.1 b/eject.1
index 97aafb9..825a64c 100755
--- a/eject.1
+++ b/eject.1
@@ -1,21 +1,14 @@
-.Dd October 16, 2013
-.Dt EJECT 1 1
-.Os Linux
-.Sh NAME
-.Nm eject
-.Nd eject removable media
-.Sh SYNOPSIS
-.Nm eject
-.Op Fl t
-.Sh DESCRIPTION
+.TH EJECT 1 ubase\-VERSION
+.OS Linux
+.SH NAME
+eject \- eject removable media
+.SH SYNOPSIS
+.B eject
+.RB [ \-t ]
+.SH DESCRIPTION
 eject allows the CD-ROM tray to be opened or closed under software
-.br
-control.
-.Pp
-If no arguments are given, the CD-ROM tray is opened.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl t
+control.  If no arguments are given, the CD-ROM tray is opened.
+.SH OPTIONS
+.TP
+.BI \-t
 If supported, close the CD-ROM tray.
-.El
diff --git a/halt.1 b/halt.1
index 7bf9a9f..5389d2b 100755
--- a/halt.1
+++ b/halt.1
@@ -1,19 +1,16 @@
-.Dd October 17, 2013
-.Dt HALT 8 1
-.Os Linux
-.Sh NAME
-.Nm halt
-.Nd Halt, power-off or reboot the machine
-.Sh SYNOPSIS
-.Nm halt
-.Op Fl pr
-.Sh DESCRIPTION
+.TH HALT 8 ubase\-VERSION
+.OS Linux
+.SH NAME
+halt \- Halt, power-off or reboot the machine
+.SH SYNOPSIS
+.B halt
+.RB [ \-pr ]
+.SH DESCRIPTION
 halt can be used to halt, power-off or reboot the machine.
-.Pp
-The options are as follows:
-.Bl -tag -width Ds
-.It Fl p
+.SH OPTIONS
+.TP
+.BI \-p
 power-off the machine.
-.It Fl r
+.TP
+.BI \-r
 reboot the machine.
-.El
diff --git a/lsmod.1 b/lsmod.1
index e1c5e91..fc2ca4a 100755
--- a/lsmod.1
+++ b/lsmod.1
@@ -1,9 +1,7 @@
-.Dd October 16, 2013
-.Dt lsmod 8 1
-.Os Linux
-.Sh NAME
-.Nm lsmod
-.Nd list loaded kernel modules
-.Sh DESCRIPTION
+.TH lsmod 8 sbase\-VERSION
+.OS Linux
+.SH NAME
+lsmod \- list loaded kernel modules
+.SH DESCRIPTION
 lsmod parses `/proc/modules' and shows the loadable kernel modules that are
 currently loaded.
diff --git a/lsusb.1 b/lsusb.1
index af20655..28a62cb 100755
--- a/lsusb.1
+++ b/lsusb.1
@@ -1,9 +1,7 @@
-.Dd October 16, 2013
-.Dt LSUSB 8 1
-.Os Linux
-.Sh NAME
-.Nm lsusb
-.Nd list USB devices
-.Sh DESCRIPTION
+.TH LSUSB 8 ubase\-VERSION
+.OS Linux
+.SH NAME
+lsusb \- list USB devices
+.SH DESCRIPTION
 lsusb searches in `/sys/bus/usb/devices' for usb buses and connected devices and prints
 them one by one.