diff --git a/debian/changelog b/debian/changelog
index d38cbe5..805a470 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@
   * Tweak debian/copyright based on debmake -k's suggestions.
   * Enable LIRC support.
   * Bump standards version to 3.8.6 (no changes required).
+  * Update debian/man/squeezelite.1 to document new features/options added
+    since 1.6.4.
 
  -- Chris Boot <debian@bootc.net>  Sat, 09 May 2015 18:17:17 +0100
 
diff --git a/debian/man/squeezelite.1 b/debian/man/squeezelite.1
index 5057a36..bc6395b 100644
--- a/debian/man/squeezelite.1
+++ b/debian/man/squeezelite.1
@@ -4,7 +4,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH SQUEEZELITE 1 "2014-06-16" "Debian Project"
+.TH SQUEEZELITE 1 "2015-05-10" "Debian Project"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -32,7 +32,7 @@
 .SH OPTIONS
 This program supports the following options:
 .TP
-.B \-h
+.B \-?
 Show a summary of the available command-line options.
 .TP
 .B \-s <server>[:<port>]
@@ -42,7 +42,7 @@
 segment (e.g. behind a router).
 .TP
 .B \-o <output device>
-Specify the audio output device; the default value is 
+Specify the audio output device; the default value is
 .IR default .
 Use the
 .B \-l
@@ -87,9 +87,15 @@
 .B squeezelite -h
 to obtain the list of codecs built into \fBsqueezelite\fR.
 .TP
+.B \-C <timeout>
+Close the output device after
+.B <timeout>
+seconds of the player being idle; the default is to always keep the device open
+as long as the payer is "on".
+.TP
 .B \-d <category>=<level>
 Set logging level. Categories are:
-.IR all ", " slimproto ", " stream ", " decode " or " output .
+.IR all ", " slimproto ", " stream ", " decode ", " output " or " ir .
 Levels can be:
 .IR info ", " debug " or " sdebug .
 The option can be repeated to set different log levels for different categories.
@@ -102,10 +108,21 @@
 .B \-f <logfile>
 Send logging output to a log file instead of standard output or standard error.
 .TP
+.B \-i [<filename>]
+Enable LIRC remote control support. If the optional
+.B <filename>
+is not provided,
+.I ~/.lircrc
+is used instead.
+.TP
 .B \-m <mac addr>
 Override the player's MAC address. The format must be colon-delimited
 hexadecimal, for example: ab:cd:ef:12:34:56. This is usually automatically
 detected, and should not need to be provided in most circumstances.
+.TP
+.B \-M <modelname>
+Override the player's hardware model name. The default value is
+.IR SqueezeLite .
 .TP
 .B \-n <name>
 Set the player name. This name is used by the Logitech Media Server to refer to
@@ -123,6 +140,11 @@
 Set real time priority of output thread (1-99; default
 .IR 45 ).
 Not applicable when using PortAudio.
+.TP
+.B \-P <filename>
+Write the process ID (PID) number to the given
+.BR <filename> .
+This may be useful when running \fBsqueezelite\fR as a daemon.
 .TP
 .B \-r <rates>[:<delay>]
 Specify sample rates supported by the output device; this is required if the
@@ -149,6 +171,26 @@
 Enable visualiser support. This creates a shared memory segment that contains
 some of the audio being played, so that an external visualiser can read and
 process this to create visualisations.
+.TP
+.B \-L
+List available volume controls for the output device. Only applicable when
+using ALSA output.
+.TP
+.B \-U <control>
+Unmute the given ALSA
+.B <control>
+at daemon startup and set it to full volume. Use software volume adjustment for
+playback. This option is mutually exclusive with the \fB\-V\fR option. Only
+applicable when using ALSA output.
+.TP
+.B \-V <control>
+Use the given ALSA
+.B <control>
+for volume adjustment during playback. This prevents the use of software volume
+control within \fBsqueezelite\fR. This option is mutually exclusive with the
+\fB\-V\fR option. If neither \fB\-U\fR nor \fB\-V\fR options are provided,
+no ALSA controls are adjusted while running \fBsqueezelite\fR and software
+volume control is used instead. Only applicable when using ALSA output.
 .TP
 .B \-z
 Cause \fBsqueezelite\fR to run as a daemon. That is, it detaches itself from the