diff --git a/CHANGES b/CHANGES
index f8d18b3..7075879 100644
--- a/CHANGES
+++ b/CHANGES
@@ -356,13 +356,18 @@ new features:
 	Added a new option termios-rawer for ptys.
 	Thanks to Christian Vogelgsang for pointing me to this requirement
 
-docu
+doc:
 	minor corrections in docu (thanks to Paggas)
 
 	minor corrections in doc (2x)
 
 	client process -> child process
 
+	In the man page the PTY example was badly formatted. Thanks to
+	J.F.Sebastian for sending a patch.
+
+	Added missing CVE ids to security issues in CHANGES
+
 testing:
 	Do not distribute testcert.conf with socat source but generate it
 	(and new testcert6.conf) during test.sh run.
@@ -377,6 +382,7 @@ security:
 ####################### V 2.0.0-b6:
 
 security:
+	CVE-2013-3571:
 	after refusing a client connection due to bad source address or source
 	port socat shutdown() the socket but did not close() it, resulting in
 	a file descriptor leak in the listening process, visible with lsof and
@@ -387,6 +393,7 @@ security:
 ####################### V 2.0.0-b5:
 
 security:
+	CVE-2012-0219:
 	fixed a possible heap buffer overflow in the readline address. This bug
 	could be exploited when all of the following conditions were met:
 	1) one of the addresses is READLINE without the noprompt and without the
@@ -400,6 +407,7 @@ security:
 ####################### V 2.0.0-b4:
 
 security:
+	CVE-2010-2799:
 	fixed a stack overflow vulnerability that occurred when command
 	line arguments (whole addresses, host names, file names) were longer
 	than 512 bytes.
@@ -883,7 +891,8 @@ further corrections:
 
 ####################### V 1.4.0.3:
 
-corrections:
+security:
+	CVE-2004-1484:
 	fix to a syslog() based format string vulnerability that can lead to
 	remote code execution. See advisory socat-adv-1.txt
 
diff --git a/README b/README
index 871b084..fff675e 100644
--- a/README
+++ b/README
@@ -257,7 +257,7 @@ correction must be performed in /usr/share/yodl/shared.yo in two places:
 license
 -------
 
-socat is distributed under the terms of the GNU GPL;
+socat is distributed under the terms of the GNU GPLv2;
 except for install-sh, which is copyright MIT, with its own license;
 
 In addition, as a special exception, the copyright holder
diff --git a/doc/socat.yo b/doc/socat.yo
index 2a2eecc..137f30b 100644
--- a/doc/socat.yo
+++ b/doc/socat.yo
@@ -3231,7 +3231,14 @@ label(EXAMPLE_ADDRESS_PTY)
 label(EXAMPLE_OPTION_SYMBOLIC_LINK)
 label(EXAMPLE_OPTION_WAIT_SLAVE)
 label(EXAMPLE_OPTION_NONBLOCK)
-(bf(tt(socat PTY,link=$HOME/dev/vmodem0,raw,echo=0,wait-slave EXEC:'"ssh modemserver.us.org socat - /dev/ttyS0,nonblock,raw,echo=0"')))
+mancommand(\.LP)
+mancommand(\.nf)
+mancommand(\fBsocat PTY,link=$HOME/dev/vmodem0,raw,echo=0,wait-slave \\\bf)
+mancommand(\fBEXEC:"ssh modemserver.us.org socat - /dev/ttyS0,nonblock,raw,echo=0"\fP)
+mancommand(\.fi)
+
+htmlcommand(<dt><code><strong>socat PTY,link=$HOME/dev/vmodem0,raw,echo=0,wait-slave \</strong><br>
+<strong>EXEC:'"ssh modemserver.us.org socat - /dev/ttyS0,nonblock,raw,echo=0"'</strong></code><dd>)
 
 generates a pseudo terminal 
 device (link(PTY)(ADDRESS_PTY)) on the client that can be reached under the
@@ -3557,7 +3564,7 @@ socat() sets this variable to the transfer class of the received packet.
 
 dit(bf(SOCAT_OPENSSL_X509_ISSUER) (output)) Issuer field from peer certificate
 
-dit(bf(SOCAT_OPENSSL_X509_SUBJECT (output))) Subject field from peer certificate
+dit(bf(SOCAT_OPENSSL_X509_SUBJECT) (output)) Subject field from peer certificate
 
 dit(bf(SOCAT_OPENSSL_X509_COMMONNAME) (output)) commonName entries from peer certificates subject. Multiple values are separated by " // ".
 
diff --git a/test.sh b/test.sh
index d7826fe..212b507 100755
--- a/test.sh
+++ b/test.sh
@@ -11909,8 +11909,8 @@ tf="$td/test$N.stdout"
 tdiff="$td/test$N.diff"
 da="test$N $(date) $RANDOM"
 #testserversec "$N" "$TEST" "$opts -s" "tcp4-l:$PORT,reuseaddr,fork,retry=1" "" "range=$SECONDADDR/32" "tcp4:127.0.0.1:$PORT" 4 tcp $PORT 0
-CMD0="$TRACE $SOCAT $opts TCP4-LISTEN:$PORT,reuseaddr,range=127.0.0.1/0 CREATE:$tf"
-CMD1="$TRACE $SOCAT $opts - TCP4-CONNECT:$SECONDADDR:$PORT,bind=$SECONDADDR"
+CMD0="$TRACE $SOCAT $opts -u TCP4-LISTEN:$PORT,reuseaddr,range=127.0.0.1/0 CREATE:$tf"
+CMD1="$TRACE $SOCAT $opts -u - TCP4-CONNECT:$SECONDADDR:$PORT,bind=$SECONDADDR"
 printf "test $F_n $TEST... " $N
 $CMD0 2>"${te}0" &
 pid0=$!