diff --git a/linphone/console/linphonec.c b/linphone/console/linphonec.c
index 258bc1eb8..485eaf24f 100644
--- a/linphone/console/linphonec.c
+++ b/linphone/console/linphonec.c
@@ -368,6 +368,7 @@ static void start_prompt_reader(void){
 static ortp_socket_t create_server_socket(int port){
 	ortp_socket_t server_sock;
 	char service[12];
+	int tmp,err;
 	/*setup the server socket */
 	struct addrinfo *ai=NULL;
 	struct addrinfo hints;
@@ -381,6 +382,9 @@ static ortp_socket_t create_server_socket(int port){
 		exit(-1);
 	}
 	server_sock=socket(PF_INET,SOCK_STREAM,IPPROTO_TCP);
+	tmp=1;
+	err=setsockopt(server_sock,SOL_SOCKET,SO_REUSEADDR,(void*)&tmp,sizeof(tmp));
+	if (err<0) fprintf(stderr,"Error in setsockopt(): %s\n",getSocketError());
 	if (bind(server_sock,ai->ai_addr,ai->ai_addrlen)!=0){
 		fprintf(stderr,"Failed to bind command socket.");
 		exit(-1);
diff --git a/linphone/mediastreamer2/tests/mediastream.c b/linphone/mediastreamer2/tests/mediastream.c
index 7210dea61..44c3c93f0 100644
--- a/linphone/mediastreamer2/tests/mediastream.c
+++ b/linphone/mediastreamer2/tests/mediastream.c
@@ -121,7 +121,8 @@ const char *usage="mediastream --local <port> --remote <ip:port> --payload <payl
 								"[ --fmtp <fmtpline>]\n"
 								"[ --jitter <miliseconds>]\n"
 								"[ --width <pixels>]\n"
-								"[ --height <pixels> ]\n";
+								"[ --height <pixels> ]\n"
+								"[ --bitrate <bits per seconds>]\n";
 static void run_media_streams(int localport, const char *remote_ip, int remoteport, int payload, const char *fmtp, int jitter, bool_t ec, int bitrate, MSVideoSize vs);