diff --git a/man/witray.1 b/man/witray.1
index 4d20161d..fae886ac 100644
--- a/man/witray.1
+++ b/man/witray.1
@@ -1,16 +1,20 @@
 .TH "WITRAY" 1 "May, 2010" "wmii-@VERSION@"
 
+
 .SH NAME
+
 .P
 witray \- The wmii system tray
 
 .SH SYNOPSIS
+
 .P
-witray \fI[\-a \fI<address>\fR]\fR \fI[\-NESW]\fR \fI[\-HV]\fR \fI[\-p \fI<padding>\fR]\fR \fI[\-s \fI<iconsize>\fR]\fR \-t (tags) 
+witray [\fI\-a \fI<address>\fR\fR] [\fI\-NESW\fR] [\fI\-HV\fR] [\fI\-p \fI<padding>\fR\fR] [\fI\-s \fI<iconsize>\fR\fR] \-t (tags) 
 .P
 witray \-v
 
 .SH DESCRIPTION
+
 .P
 \fBwitray\fR is a simple system tray program meant to be used with wmii.
 It supports the Freedesktop System Tray Protocol Specification
@@ -21,6 +25,7 @@ tailored to wmii. It's simple, stays out of the user's way, is easy
 to configure, and generally Just Works.
 
 .SH ARGUMENTS
+
 .TP
 \-a
 The address at which to connect to \fBwmii\fR.
@@ -35,6 +40,7 @@ East_ corner of the screen. If no options are given,
 \fBwitray\fR opens to the West of whichever part of the screen
 the wmii bar occupies.
 .RE
+
 .TP
 \-H \-V
 
@@ -43,6 +49,10 @@ Specifies whether icons are to be aligned horizontally or
 vertically, respectively. Also determines from which edge of
 the screen windows are shunted to make room for the tray.
 .RE
+
+.TP
+\-n
+Do not replace an already running system tray.
 .TP
 \-p \fI<padding>\fR
 
@@ -50,6 +60,7 @@ the screen windows are shunted to make room for the tray.
 Sets the padding between icons and around the edge of the
 tray. In pixels.
 .RE
+
 .TP
 \-s \fI<iconsize>\fR
 
@@ -58,12 +69,14 @@ Sets the size of the icons, in pixels. If not provided,
 icons are sized so that the tray is the same height as the
 \fBwmii\fR bar.
 .RE
+
 .TP
 \-t \fI<tags>\fR
 
 .RS
 The tags on which to open. Default: \fI/./\fR
 .RE
+
 .TP
 \-v
 
@@ -72,14 +85,14 @@ Display version information.
 .RE
 
 .SH CAVEATS
+
 .P
 \fBwitray\fR is not XRandR aware.
 
 .SH SEE ALSO
+
 .P
 wmii(1), wimenu(1)
 
-
-.\" man code generated by txt2tags 2.5 (http://txt2tags.sf.net)
+.\" man code generated by txt2tags 2.6 (http://txt2tags.org)
 .\" cmdline: txt2tags -o- witray.man1
-
diff --git a/util/link b/util/link
index f41f7d2d..d1f5b06a 100755
--- a/util/link
+++ b/util/link
@@ -4,7 +4,7 @@ LD=$1
 PACKAGES=$2
 LDFLAGS=$3; shift 3
 
-[ -n "$PACKAGES" ] && LDFLAGS="$(pkg-config --libs $PACKAGES) $LDFLAGS"
+[ -n "$PACKAGES" ] && LDFLAGS="$LDFLAGS $(pkg-config --libs $PACKAGES)"
 
 outfile="$1"; shift
 bin="$(echo $0 | sed 's,/[^/]*$,,')"