diff --git a/console-client.c b/console-client.c
index 63c4e70..1b53624 100644
--- a/console-client.c
+++ b/console-client.c
@@ -173,7 +173,7 @@
 	memcpy(&addr.sun_path, &console_socket_path, console_socket_path_len);
 
 	rc = connect(client->console_sd, (struct sockaddr *)&addr,
-			sizeof(addr));
+			sizeof(addr) - sizeof(addr.sun_path) + console_socket_path_len);
 	if (rc) {
 		warn("Can't connect to console server");
 		close(client->console_sd);
diff --git a/socket-handler.c b/socket-handler.c
index 84cd55a..1b2cb4f 100644
--- a/socket-handler.c
+++ b/socket-handler.c
@@ -282,7 +282,8 @@
 	addr.sun_family = AF_UNIX;
 	memcpy(&addr.sun_path, &console_socket_path, console_socket_path_len);
 
-	rc = bind(sh->sd, (struct sockaddr *)&addr, sizeof(addr));
+	rc = bind(sh->sd, (struct sockaddr *)&addr,
+			sizeof(addr) - sizeof(addr.sun_path) + console_socket_path_len);
 	if (rc) {
 		warn("Can't bind to socket path %s",
 				console_socket_path_readable);