diff --git a/doc/rdesktop.1 b/doc/rdesktop.1
index b1c15e7..c48fc0c 100644
--- a/doc/rdesktop.1
+++ b/doc/rdesktop.1
@@ -7,14 +7,14 @@
 .br
 .SH DESCRIPTION
 .I rdesktop
-is a client for Microsoft Windows NT Terminal Server, Windows 2000 Terminal
-Services, Windows XP Remote Desktop, and possibly other Terminal Services
-products.  rdesktop currently implements the RDP version 4 protocol.
+is a client for Remote Desktop Protocol (RDP), used in a number of Microsoft
+products including Windows NT Terminal Server, Windows 2000 Server, Windows XP
+and Windows 2003 Server.
 
 .SH OPTIONS
 .TP
 .BR "-u <username>"
-Username for authentication on the terminal server.
+Username for authentication on the server.
 .TP
 .BR "-d <domain>"
 Domain for authentication.
@@ -22,14 +22,6 @@ Domain for authentication.
 .BR "-s <shell>"
 Startup shell for the user - starts a specific application instead of Explorer.
 .TP
-.BR "-S <button size>"
-Enable single application mode. This option can be used when running a
-single, maximized application (via -s). When the minimize button of
-the windows application is pressed, the rdesktop window is minimized
-instead of the remote application. The maximize/restore button is
-disabled. For this to work, you must specify the correct button
-size, in pixels. The special word "standard" means 18 pixels. 
-.TP
 .BR "-c <directory>"
 The initial working directory for the user.  Often used in combination with -s
 to set up a fixed login environment.
@@ -54,8 +46,8 @@ en-us, en-gb, de, fr, sv, etc.  The default is en-us (a US keyboard).
 .BR "-g <geometry>"
 Desktop geometry (WxH). If geometry is the special word "workarea", the geometry
 will be fetched from the extended window manager hints property _NET_WORKAREA, from
-the root window. The geometry can also be specified in terms of percent of the whole
-screen, like "-g 80%". 
+the root window. The geometry can also be specified as a percentage of the whole
+screen, e.g. "-g 80%". 
 .TP
 .BR "-f"
 Enable fullscreen mode.  This overrides the window manager and causes the
@@ -71,8 +63,8 @@ Disable encryption.  This option is only needed (and will only work) if you
 have a French version of NT TSE.
 .TP
 .BR "-E"
-Disable encryption from client to server.  This sends an encrypted login-packet,
-but everything after this is unencrypted. This also includes interactive logins.
+Disable encryption from client to server.  This sends an encrypted login packet,
+but everything after this is unencrypted (including interactive logins).
 .TP
 .BR "-m"
 Do not send mouse motion events.  This saves bandwidth, although some Windows
@@ -82,23 +74,39 @@ applications may rely on receiving mouse motion.
 Use private colourmap.  This will improve colour accuracy on an 8-bit display,
 but rdesktop will appear in false colour when not focused.
 .TP
+.BR "-D"
+Hide window manager decorations, by using MWM hints. 
+.TP
 .BR "-K"
 Do not override window manager key bindings.  By default rdesktop attempts
 to grab all keyboard input when it is in focus.
 .TP
-.BR "-T <title>"
-Window title.
+.BR "-S <button size>"
+Enable single application mode. This option can be used when running a
+single, maximized application (via -s). When the minimize button of
+the windows application is pressed, the rdesktop window is minimized
+instead of the remote application. The maximize/restore button is
+disabled. For this to work, you must specify the correct button
+size, in pixels. The special word "standard" means 18 pixels. 
 .TP
-.BR "-D"
-Hide window manager decorations, by using MWM hints. 
+.BR "-T <title>"
+Sets the window title.
 .TP
 .BR "-a <bpp>"
-Use bpp as colourdepth for the connection. Supported are 8, 15, 16 and 24.
-More than 8 bpp are only supported when connecting to Windows XP or
-Windows Server 2003.
+Sets the colour depth for the connection (8, 15, 16 or 24).
+More than 8 bpp are only supported when connecting to Windows XP
+(up to 16 bpp) or newer.  Note that the colour depth may also be
+limited by the server configuration.
+.TP
+.BR "-r <device>"
+Enable redirection of the specified device on the client, such
+that it appears on the server.  The only device currently supported
+is "sound" (requires Windows XP or newer).  Note that the allowed
+redirections may be restricted by the server configuration.
 .TP
 .BR "-0"
-Attach to the console of the Server.
+Attach to the console of the server (requires Windows Server 2003
+or newer).
 .TP
 .BR "-4"
 Use RDP version 4.
diff --git a/rdesktop.c b/rdesktop.c
index f45710a..abab1b1 100644
--- a/rdesktop.c
+++ b/rdesktop.c
@@ -69,7 +69,7 @@ BOOL g_console_session = False;
 extern BOOL g_owncolmap;
 
 #ifdef WITH_RDPSND
-BOOL g_rdpsnd = True;
+BOOL g_rdpsnd = False;
 #endif
 
 #ifdef RDP2VNC
@@ -95,11 +95,10 @@ usage(char *program)
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
 	fprintf(stderr, "   -s: shell\n");
-	fprintf(stderr, "   -S: caption button size (single application mode)\n");
 	fprintf(stderr, "   -c: working directory\n");
 	fprintf(stderr, "   -p: password (- to prompt)\n");
 	fprintf(stderr, "   -n: client hostname\n");
-	fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr,etc.)\n");
+	fprintf(stderr, "   -k: keyboard layout on server (en-us, de, sv, etc.)\n");
 	fprintf(stderr, "   -g: desktop geometry (WxH)\n");
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
@@ -107,13 +106,12 @@ usage(char *program)
 	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -C: use private colour map\n");
-	fprintf(stderr, "   -K: keep window manager key bindings\n");
-	fprintf(stderr, "   -T: window title\n");
 	fprintf(stderr, "   -D: hide window manager decorations\n");
-#ifdef WITH_RDPSND
-	fprintf(stderr, "   -A: disable audio-redirection\n");
-#endif
-	fprintf(stderr, "   -a: server bpp\n");
+	fprintf(stderr, "   -K: keep window manager key bindings\n");
+	fprintf(stderr, "   -S: caption button size (single application mode)\n");
+	fprintf(stderr, "   -T: window title\n");
+	fprintf(stderr, "   -a: connection colour depth\n");
+	fprintf(stderr, "   -r: enable specified device redirection (currently: sound)\n");
 	fprintf(stderr, "   -0: attach to console\n");
 	fprintf(stderr, "   -4: use RDP version 4\n");
 	fprintf(stderr, "   -5: use RDP version 5 (default)\n");
@@ -231,7 +229,7 @@ main(int argc, char *argv[])
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:AD045h?")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:a:r:045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -262,23 +260,6 @@ main(int argc, char *argv[])
 				STRNCPY(shell, optarg, sizeof(shell));
 				break;
 
-			case 'S':
-				if (!strcmp(optarg, "standard"))
-				{
-					g_win_button_size = 18;
-					break;
-				}
-
-				g_win_button_size = strtol(optarg, &p, 10);
-
-				if (*p)
-				{
-					error("invalid button size\n");
-					return 1;
-				}
-
-				break;
-
 			case 'c':
 				STRNCPY(directory, optarg, sizeof(directory));
 				break;
@@ -357,16 +338,33 @@ main(int argc, char *argv[])
 				g_owncolmap = True;
 				break;
 
+			case 'D':
+				g_hide_decorations = True;
+				break;
+
 			case 'K':
 				g_grab_keyboard = False;
 				break;
 
-			case 'T':
-				STRNCPY(g_title, optarg, sizeof(g_title));
+			case 'S':
+				if (!strcmp(optarg, "standard"))
+				{
+					g_win_button_size = 18;
+					break;
+				}
+
+				g_win_button_size = strtol(optarg, &p, 10);
+
+				if (*p)
+				{
+					error("invalid button size\n");
+					return 1;
+				}
+
 				break;
 
-			case 'D':
-				g_hide_decorations = True;
+			case 'T':
+				STRNCPY(g_title, optarg, sizeof(g_title));
 				break;
 
 			case 'a':
@@ -379,11 +377,15 @@ main(int argc, char *argv[])
 				}
 				break;
 
+			case 'r':
+				if (!strcmp(optarg, "sound"))
 #ifdef WITH_RDPSND
-			case 'A':
-				g_rdpsnd = False;
-				break;
+					g_rdpsnd = True;
+#else
+					warning("Not compiled with sound support");
 #endif
+				break;
+
 			case '0':
 				g_console_session = True;
 				break;
@@ -459,9 +461,7 @@ main(int argc, char *argv[])
 
 #ifdef WITH_RDPSND
 	if (g_rdpsnd)
-	{
 		rdpsnd_init();
-	}
 #endif
 	/* rdpdr_init(); */