diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 2c53721cb..248ee9dca 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-09  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* socket.c (scm_c_make_socket_address): Pass address_size pointer
+	on to scm_fill_sockaddr call.
+
 2006-02-04  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* throw.h (scm_c_catch, scm_c_with_throw_handler,
diff --git a/libguile/socket.c b/libguile/socket.c
index 7e296d467..e15806fc2 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -1238,11 +1238,10 @@ struct sockaddr *
 scm_c_make_socket_address (SCM family, SCM address, SCM args,
 			   size_t *address_size)
 {
-  size_t size;
   struct sockaddr *soka;
 
   soka = scm_fill_sockaddr (scm_to_ushort (family), address, &args, 1,
-			    "scm_c_make_socket_address", &size);
+			    "scm_c_make_socket_address", address_size);
 
   return soka;
 }