Index: doc/asterisk.8
===================================================================
--- doc/asterisk.8	(revision 95014)
+++ doc/asterisk.8	(working copy)
@@ -12,7 +12,7 @@
 \fBasterisk\fR [ \fB-tThfdvVqpRgciIn\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ]
 
 
-\fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ]
+\fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-s \fIsocket\fB\fR ]
 
 .SH "DESCRIPTION"
 .PP
@@ -117,6 +117,10 @@
 for controlling it. Additionally, if connection to the Asterisk 
 process is lost, attempt to reconnect for as long as 30 seconds.
 .TP
+\fB-s \fIsocket\fB\fR
+Allows to specify the socket file to be used to connect to the
+Asterisk console. Used in conjunction with \fB-r\fR or \fB-R\fR.
+.TP
 \fB-I\fR
 Enable internal timing if Zaptel timer is available
 The default behaviour is that outbound packets are phase locked
Index: main/asterisk.c
===================================================================
--- main/asterisk.c	(revision 95014)
+++ main/asterisk.c	(working copy)
@@ -2851,7 +2851,7 @@
 	ast_readconfig();
 
 	if (ast_opt_remote && remotesock != NULL)
-		ast_copy_string((char *) ast_config_AST_SOCKET, remotesock, sizeof(ast_config_AST_SOCKET));
+		ast_copy_string((char *) cfg_paths.socket_path, remotesock, sizeof(cfg_paths.socket_path));
 
 	if (!ast_language_is_prefix && !ast_opt_remote)
 		ast_log(LOG_WARNING, "The 'languageprefix' option in asterisk.conf is deprecated; in a future release it will be removed, and your sound files will need to be organized in the 'new style' language layout.\n");