diff -ru gputils-0.13.5/man/gpasm.1 gputils-0.13.5-man/man/gpasm.1
--- gputils-0.13.5/man/gpasm.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gpasm.1	2007-10-28 14:31:35.000000000 +0100
@@ -1,12 +1,12 @@
-.TH gpasm 1 "(c) 2002, 2003, 2004, 2005 James Bowman, Craig Franklin"
+.TH GPASM 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gpasm - GNU PIC assembler
+gpasm \- GNU PIC assembler
 .SH SYNOPSIS
 .B gpasm [options] file
 .SH WARNING
 The information in this man page is an extract from the full documentation of
-gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+gputils and is limited to the meaning of the options.  For complete and
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gpasm
@@ -14,95 +14,96 @@
 It's intended to be compatible with the manufacturer's MPASM
 assembler.
 .B gpasm
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 Below is a summary of the
-.B gpasm 
+.B gpasm
 options.
 .B gpasm
 options always supersede any settings in the source code.
 .TP
-.B -a FMT, --hex-format FMT       
-GPASM supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats.  This 
+.BR "\-a FMT" , " \-\-hex\-format FMT
+GPASM supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats.  This
 option controls which hex file format is used.  The default is inhx32.
 .TP
-.B -c, --object 
+.BR \-c ", "\-\-object
 Output a relocatable object.
 .TP
-.B -d, --debug   
+.BR \-d ", " \-\-debug
 Output debug messages.
 .TP
-.B -D SYM=VAL, --define SYM=VAL   
-Define SYM with value VAL. This is equivalent to placing "#define SYM VAL" in 
+.BR "\-D SYM=VAL" , " \-\-define SYM=VAL"
+Define SYM with value VAL. This is equivalent to placing "#define SYM VAL" in
 the source.
 .TP
-.B -e [ON|OFF], --expand [ON|OFF] 
+.BR "\-e [ON|OFF]" , " \-\-expand [ON|OFF]"
 Macro expansion in the listing file is controlled using the EXPAND and NOEXPAND
 directives.  This option can force either directive to be ignored.  When "ON"
-is selected the macros are always expanded regardless of the presence of 
-NOEXPAND.  Likewise, "OFF" will force macros not to be expanded. 
+is selected the macros are always expanded regardless of the presence of
+NOEXPAND.  Likewise, "OFF" will force macros not to be expanded.
 .TP
-.B -g, --debug-info   
+.BR \-g ", " \-\-debug-info
 Use debug directives for COFF.
 .TP
-.B -h, --help
+.BR \-h ", " \-\-help
 Show the usage message.
 .TP
-.B -i, --ignore-case 
+.BR \-i ", " \-\-ignore\-case
 All user defined symbols and macros are case sensitive.  This option makes them
 case insensitive.
 .TP
-.B -I DIR, --include DIR
+.BR "\-I DIR" , " \-\-include DIR"
 The top level assembly file is passed to gpasm as an argument.  This file can
-contain INCLUDE directives.  These directives open the specified file and 
-then its contents are assembled.  GPASM searches for these files in the local 
-directory.  If the file is not located, the default header path is checked.  
-Finally, all paths specified using this argument are searched. 
+contain INCLUDE directives.  These directives open the specified file and
+then its contents are assembled.  GPASM searches for these files in the local
+directory.  If the file is not located, the default header path is checked.
+Finally, all paths specified using this argument are searched.
 .TP
-.B -L, --force-list 
-Ignore NOLIST directives.  This forces gpasm to print every line assembled in 
+.BR \-L ", "\-\-force-list
+Ignore NOLIST directives.  This forces gpasm to print every line assembled in
 the list file output.
 .TP
-.B -l, --list-chips
+.BR \-l ", "\-\-list\-chips
 List the supported processors.
 .TP
-.B -m, --dump
-Upon completion of the final pass of assembly, display the contents of 
+.BR \-m ", "\-\-dump
+Upon completion of the final pass of assembly, display the contents of
 instruction memory.
 .TP
-.B -M, --deps
+.BR \-M ", "\-\-deps
 Output a dependency file.
 .TP
-.B -n, --dos
-By default, gpasm generates hex files using ISO format.  However, some device 
-programmers required a DOS formatted file.  This option will cause gpasm to 
+.BR \-n ", "\-\-dos
+By default, gpasm generates hex files using ISO format.  However, some device
+programmers required a DOS formatted file.  This option will cause gpasm to
 generate a DOS formatted hex file.
 .TP
-.B -o FILE, --output FILE
+.BR "\-o FILE" , " \-\-output FILE"
 Alternate name of the output file.
 .TP
-.B -p PROC, --processor PROC
+.BR "\-p PROC" , " \-\-processor PROC"
 Select the processor.
 .TP
-.B -q, --quiet
+.BR \-q ", "\-\-quiet
 Suppress anything sent to standard output.
 .TP
-.B -r RADIX, --radix RADIX
+.BR "\-r RADIX" , " \-\-radix RADIX"
 The supported radices are BIN, DEC, OCT, and HEX.  The default is HEX.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .TP
-.B -w [0|1|2], --warning [0|1|2]
+.BR "\-w [0|1|2]" , " \-\-warning [0|1|2]"
 This option sets the message level. "0" is the default.  It will allow all 
 messages, warnings, and errors to be reported.  "1" will suppress the messages.
 "2" will suppress the messages and warnings.
 .TP
-.B -y, --extended
+.BR \-y ", "\-\-extended
 Enable 18xx extended mode.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gpdasm.1 gputils-0.13.5-man/man/gpdasm.1
--- gputils-0.13.5/man/gpdasm.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gpdasm.1	2007-10-28 14:32:01.000000000 +0100
@@ -1,50 +1,51 @@
-.TH gpdasm 1 "(c) 2002, 2003, 2004, 2005 Craig Franklin"
+.TH GPDASM 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gpdasm - GNU PIC disassembler
+gpdasm \- GNU PIC disassembler
 .SH SYNOPSIS
 .B gpdasm [options] file
 .SH WARNING
 The information in this man page is an extract from the full documentation of
-gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+gputils and is limited to the meaning of the options.  For complete and
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gpdasm
 is an disassembler for Microchip (TM) PIC (TM) micro-controllers.
 .B gpdasm
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -c, --mnemonics
+.BR \-c ", " \-\-mnemonics
 Decode special mnemonics.
 .TP
-.B -h, --help
+.BR \-h ", "\-\-help
 Show the usage message.
 .TP
-.B -i, --hex-info
+.BR \-i ", "\-\-hex-info
 Report extra information about input hex file.  This information includes file
 size and hex format.
 .TP
-.B -l, --list-chips
+.BR \-l ", "\-\-list-chips
 List the supported processors.
 .TP
-.B -m, --dump
+.BR \-m ", "\-\-dump
 Display the contents of instruction memory.
 .TP
-.B -p PROC, --processor PROC
+.BR "\-p PROC" , " \-\-processor PROC
 Select the processor.
 .TP
-.B -s, --short
+.BR \-s ", "\-\-short
 Output the short format.  This format can be reassembled by gpasm.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .TP
-.B -y, --extended
+.BR \-y ", "\-\-extended
 Enable 18xx extended mode.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gplib.1 gputils-0.13.5-man/man/gplib.1
--- gputils-0.13.5/man/gplib.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gplib.1	2007-10-28 14:47:35.000000000 +0100
@@ -1,53 +1,54 @@
-.TH gplib 1 "(c) 2002, 2003, 2004, 2005 Craig Franklin"
+.TH GPLIB 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gplib - GNU PIC Librarian
+gplib \- GNU PIC librarian
 .SH SYNOPSIS
 .B gplib [options] library [member]
 .SH WARNING
 The information in this man page is an extract from the full documentation of
-gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+gputils and is limited to the meaning of the options.  For complete and
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gplib
-creates, modifies, and extracts from COFF archives for Microchip (TM) PIC 
+creates, modifies, and extracts from COFF archives for Microchip (TM) PIC
 (TM) micro-controllers.
 .B gplib
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -c, --create
+.BR \-c ", "\-\-create
 Create a new library.
 .TP
-.B -d, --delete
+.BR \-d ", "\-\-delete
 Delete member from library.
 .TP
-.B -h, --help
-Show the usage message. 
+.BR \-h ", "\-\-help
+Show the usage message.
 .TP
-.B -n, --no-index
+.BR \-n ", "\-\-no-index
 Don't add symbol index.
 .TP
-.B -q, --quiet
+.BR \-q ", "\-\-quiet
 Quiet mode.
 .TP
-.B -r, --replace
+.BR \-r ", "\-\-replace
 Add or replace member from library.
 .TP
-.B -s, --symbols
+.BR \-s ", "\-\-symbols
 List global symbols in library.
 .TP
-.B -t, --list
+.BR \-t ", "\-\-list
 List members in library.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .TP
-.B -x, --extract
+.BR \-x ", "\-\-extract
 Extract member from library.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gplink.1 gputils-0.13.5-man/man/gplink.1
--- gputils-0.13.5/man/gplink.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gplink.1	2007-10-28 14:47:45.000000000 +0100
@@ -1,12 +1,12 @@
-.TH gplink 1 "(c) 2002, 2003, 2004, 2005 Craig Franklin"
+.TH GPLINK 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gplink - GNU PIC Linker
+gplink \- GNU PIC linker
 .SH SYNOPSIS
 .B gplink [options] [objects] [libraries]
 .SH WARNING
 The information in this man page is an extract from the full documentation of
-gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+gputils and is limited to the meaning of the options.  For complete and
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gplink
@@ -14,54 +14,55 @@
 ties up their symbol references.  It outputs an executable for Microchip (TM) 
 PIC (TM) micro-controllers.
 .B gplink
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -a FMT, --hex-format FMT       
-gplink supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats.  This 
+.BR "\-a FMT" , " \-\-hex\-format FMT
+gplink supports inhx8m, inhx8s, inhx16, and inhx32 hex file formats.  This
 option controls which hex file format is used.  The default is inhx32.
 .TP
-.B -c, --object 
+.BR \-c ", "\-\-object
 Output an executable object.
 .TP
-.B -d, --debug 
+.BR \-d ", "\-\-debug
 Display debug messages.
 .TP
-.B -f VALUE, --fill VALUE 
-Fill unused unprotected program memory with value.  The value supercedes the 
-linker script fill value.  The value must not be greater than 0xffff.  The 
+.BR "\-f VALUE" , " \--fill VALUE
+Fill unused unprotected program memory with value.  The value supercedes the
+linker script fill value.  The value must not be greater than 0xffff.  The
 value is hex.  The value may be preceeded by "0x".
 .TP
-.B -h, --help
-Show the usage message. 
+.BR \-h ", "\-\-help
+Show the usage message.
 .TP
-.B -I DIR, --include DIR
+.BR "\-I DIR" , " \-\-include DIR
 Specify include directory.
 .TP
-.B -m, --map
+.BR \-m ", "\-\-map
 Output a map file.
 .TP
-.B -o FILE, --output FILE
+.BR "\-o FILE" , " \-\-output FILE
 Alternate name of the output file.
 .TP
-.B -q, --quiet
+.BR \-q ", "\-\-quiet
 Suppress anything sent to standard output.
 .TP
-.B -r, --use-shared
+.BR \-r ", "\-\-use\-shared
 Attempt to relocate unshared data sections to shared memory if relocation
 fails.
 .TP
-.B -s FILE, --script FILE
+.BR "\-s FILE" , " \-\-script FILE
 Linker script.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .TP
-.B -w, --processor-mismatch
+.BR \-w ", "\-\-processor\-mismatch
 Disable "processor mismatch" warning.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gpstrip.1 gputils-0.13.5-man/man/gpstrip.1
--- gputils-0.13.5/man/gpstrip.1	2005-05-12 06:46:53.000000000 +0200
+++ gputils-0.13.5-man/man/gpstrip.1	2007-10-28 14:30:41.000000000 +0100
@@ -1,55 +1,56 @@
-.TH gpstrip 1 "(c) 2005 Craig Franklin"
+.TH GPSTRIP 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gpstrip - discard symbols from object file
+gpstrip \- discard symbols from object file
 .SH SYNOPSIS
 .B gpstrip [options] [file(s)]
 .SH WARNING
 The information in this man page is an extract from the full documentation of
 gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gpstrip
 discards symbols from GNU PIC object files.
 .B gpstrip
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -g, --strip-debug
-Strip debug symbols. 
+.BR \-g ", "\-\-strip\-debug
+Strip debug symbols.
 .TP
-.B -h, --help
-Show this usage message. 
+.BR \-h ", "\-\-help
+Show this usage message.
 .TP
-.B -k SYMBOL, --keep-symbol SYMBOL
-Keep symbol. 
+.BR "\-k SYMBOL" , " \-\-keep\-symbol SYMBOL
+Keep symbol.
 .TP
-.B -n SYMBOL, --strip-symbol SYMBOL
+.BR "\-n SYMBOL" , " \-\-strip\-symbol SYMBOL
 Remove symbol. 
 .TP
-.B -o FILE, --output FILE
-Alternate name of output file. 
+.BR "\-o FILE" , " \-\-output FILE
+Alternate name of output file.
 .TP
-.B -p, --preserve-dates
-Preserve dates. 
+.BR \-p ", "\-\-preserve\-dates
+Preserve dates.
 .TP
-.B -r SECTION, --remove-section SECTION
-Remove section. 
+.BR "\-r SECTION" , " \-\-remove-section SECTION
+Remove section.
 .TP
-.B -s, --strip-all
-Remove all symbols. 
+.BR \-s ", "\-\-strip\-all
+Remove all symbols.
 .TP
-.B -u, --strip-unneeded
-Strip symbols not need for relocations. 
+.BR \-u ", "\-\-strip\-unneeded
+Strip symbols not need for relocations.
 .TP
-.B -v, --version
-Show version. 
+.BR \-v ", "\-\-version
+Show version.
 .TP
-.B -x, --discard-all
-Remove non-global symbols. 
+.BR \-x ", "\-\-discard-all
+Remove non-global symbols.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gputils.1 gputils-0.13.5-man/man/gputils.1
--- gputils-0.13.5/man/gputils.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gputils.1	2007-10-28 14:48:03.000000000 +0100
@@ -1,13 +1,19 @@
-.TH gputils 1 "(c) 2002, 2003, 2004, 2005 James Bowman, Craig Franklin"
+.TH GPUTILS 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gputils - GNU PIC Utilities
+gputils \- GNU PIC utilities
 .SH DESCRIPTION
 .B gputils
-is a collection of development tools for Microchip (TM) PIC (TM) 
-microcontrollers. It's intended to be compatible with the manufacturer's 
-tools, MPASM, MPLINK,and MPLIB.
+is a collection of development tools for Microchip (TM) PIC (TM)
+microcontrollers. It's intended to be compatible with the manufacturer's
+tools, MPASM, MPLINK and MPLIB.
 .SH SEE ALSO
-gpasm(1), gpdasm(1), gplib(1), gplink(1), gpstrip(1), gpvc(1), gpvo(1)
+.BR gpasm (1),
+.BR gpdasm (1),
+.BR gplib (1),
+.BR gplink (1),
+.BR gpstrip (1),
+.BR gpvc (1),
+.BR gpvo (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gpvc.1 gputils-0.13.5-man/man/gpvc.1
--- gputils-0.13.5/man/gpvc.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gpvc.1	2007-10-28 14:39:12.000000000 +0100
@@ -1,47 +1,48 @@
-.TH gpvc 1 "(c) 2002, 2003, 2004, 2005 Scott Dattalo"
+.TH GPVC 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gpvc - GNU PIC COD file Viewer
+gpvc \- GNU PIC COD file viewer
 .SH SYNOPSIS
 .B gpvc [options] file
 .SH WARNING
 The information in this man page is an extract from the full documentation of
 gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gpvc
 is an COD file viewer for Microchip (TM) PIC (TM) micro-controllers.  COD files
 are and output from gpasm.  They contain information used for simulation.
 .B gpvc
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -a, --all
-Display all information in the COD file
+.BR \-a ", "\-\-all
+Display all information in the COD file.
 .TP
-.B -d, --directory
+.BR \-d ", "\-\-directory
 Display directory header.
 .TP
-.B -l, --listing
+.BR \-l ", "\-\-listing
 Display source listing.
 .TP
-.B -m, --message
+.BR \-m ", "\-\-message
 Display debug message area.
 .TP
-.B -h, --help
-Show the usage message. 
+.BR \-h ", "\-\-help
+Show the usage message.
 .TP
-.B -r, --rom 
-Display rom.
+.BR \-r ", "\-\-rom
+Display ROM.
 .TP
-.B -s, --symbols
+.BR \-s ", "\-\-symbols
 Display symbols.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT
diff -ru gputils-0.13.5/man/gpvo.1 gputils-0.13.5-man/man/gpvo.1
--- gputils-0.13.5/man/gpvo.1	2007-06-21 03:12:44.000000000 +0200
+++ gputils-0.13.5-man/man/gpvo.1	2007-10-28 14:44:29.000000000 +0100
@@ -1,56 +1,57 @@
-.TH gpvo 1 "(c) 2002, 2003, 2004, 2005 Craig Franklin"
+.TH GPVO 1 "2007-10-27" "gputils-0.13.5" "Linux user's manual"
 .SH NAME
-gpvo - GNU PIC object file Viewer
+gpvo \- GNU PIC object file viewer
 .SH SYNOPSIS
 .B gpvo [options] file
 .SH WARNING
 The information in this man page is an extract from the full documentation of
-gputils and is limited to the meaning of the options.  For complete and 
-current documentation, refer to "gputils.ps" located in the gputils docs 
+gputils and is limited to the meaning of the options.  For complete and
+current documentation, refer to "gputils.ps" located in the gputils docs
 directory.
 .SH DESCRIPTION
 .B gpvo
-is an COFF object file viewer for Microchip (TM) PIC (TM) micro-controllers.  
+is an COFF object file viewer for Microchip (TM) PIC (TM) micro-controllers.
 COFF files are relocatable objects output from gpasm.
 .B gpvo
-is part of gputils.  Check the gputils(1) manpage for details on other GNU 
-PIC utilities.
+is part of gputils.  Check the
+.BR gputils (1)
+manpage for details on other GNU PIC utilities.
 .SH OPTIONS
 .TP
-.B -b, --binary
+.BR \-b ", "\-\-binary
 Display binary data.
 .TP
-.B -c, --mnemonics
+.BR \-c ", "\-\-mnemonics
 Decode special mnemonics.
 .TP
-.B -f, --file
+.BR \-f ", "\-\-file
 Display file header.
 .TP
-.B -h, --help
-Show the usage message. 
+.BR \-h ", "\-\-help
+Show the usage message.
 .TP
-.B -o, --optional 
+.BR \-o ", "\-\-optional
 Display optional header.
 .TP
-.B -r, --string
+.BR \-r ", "\-\-string
 Display the string table.
 .TP
-.B -s, --section 
+.BR \-s ", "\-\-section
 Display sections.
 .TP
-.B -t, --symbol
+.BR \-t ", "\-\-symbol
 Display symbol table.
 .TP
-.B -v, --version
+.BR \-v ", "\-\-version
 Show the version.
 .TP
-.B -x FILE, --export FILE
+.BR "\-x FILE" , " \-\-export FILE
 Export the external symbols.
 .TP
-.B -y, --extended
+.BR \-y ", "\-\-extended
 Enable 18xx extended mode.
 .SH SEE ALSO
-gputils(1)
+.BR gputils (1)
 .SH AUTHOR
 Craig Franklin <craigfranklin@users.sourceforge.net>
 .SH COPYRIGHT