diff --git a/CHANGES b/CHANGES
index 99600e6..56cf8f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 
 corrections:
+	corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might
+	occur under those conditions. Thanks to Toni Mattila for first
+	reporting this problem.
+
 	socat crashed on systems without setenv() (esp. SunOS up to Solaris 9);
 	thanks to Todd Stansell for reporting this bug
 
diff --git a/VERSION b/VERSION
index 67b3a53..e57f5e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-"1.7.1.0+fixsetenv"
+"1.7.1.0+sigsegv+fixsetenv"
diff --git a/xio-listen.c b/xio-listen.c
index cb885fe..b72ba60 100644
--- a/xio-listen.c
+++ b/xio-listen.c
@@ -219,8 +219,10 @@ int _xioopen_listen(struct single *xfd, int xioflags, struct sockaddr *us, sockl
       char peername[256];
       char sockname[256];
       int ps;		/* peer socket */
-      salen = sizeof(struct sockaddr);
 
+      pa = &_peername;
+      la = &_sockname;
+      salen = sizeof(struct sockaddr);
       do {
 	 /*? int level = E_ERROR;*/
 	 Notice1("listening on %s", sockaddr_info(us, uslen, lisname, sizeof(lisname)));