diff --git a/ChangeLog b/ChangeLog
index d6a2addfb..ecd0a3ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	Merge from trunk (r1649 to r1692).
 
+	* src/ejabberd_frontend_socket.erl: Fix two warnings about unused
+	variables.
+
 2008-11-28  Alexey Shchepin  <alexey@process-one.net>
 
 	* src/mod_muc/mod_muc_room.erl: Clean user activity after timeout
@@ -163,7 +166,7 @@
 
 2008-10-13  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
-	Merge from trunk (r1613 to 1649).
+	Merge from trunk (r1613 to r1649).
 
 	* src/jlib.erl: Remove all deprecated functions.
 
diff --git a/src/ejabberd_frontend_socket.erl b/src/ejabberd_frontend_socket.erl
index df604ccc3..99f0b1964 100644
--- a/src/ejabberd_frontend_socket.erl
+++ b/src/ejabberd_frontend_socket.erl
@@ -94,7 +94,7 @@ start(Module, SockMod, Socket, Opts) ->
 	    todo
     end.
 
-starttls(FsmRef, TLSOpts) ->
+starttls(FsmRef, _TLSOpts) ->
     %gen_server:call(FsmRef, {starttls, TLSOpts}),
     FsmRef.
 
@@ -137,7 +137,7 @@ close(FsmRef) ->
 sockname(FsmRef) ->
     gen_server:call(FsmRef, sockname).
 
-peername(FsmRef) ->
+peername(_FsmRef) ->
     %gen_server:call(FsmRef, peername).
     {ok, {{0, 0, 0, 0}, 0}}.