diff --git a/.cvslog b/.cvslog
new file mode 100644
index 000000000..dd13d4630
--- /dev/null
+++ b/.cvslog
@@ -0,0 +1,3 @@
+jabber://aleksey@jabber.ru
+jabber://sgolovan@nes.ru
+ryazanov@gmail.com
diff --git a/ChangeLog b/ChangeLog
index d276042e4..8fdd0eec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-09  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/ejabberd_c2s.erl: Send new id for each new stream inside one
+	session (thanks to Maxim Ryazanov)
+
+	* src/tls/tls_drv.c: Now reads all certificates from certificate
+	file instead of reading only first one (thanks to Karl-Johan
+	Karlsson)
+
+2005-04-06  Alexey Shchepin  <alexey@sevcom.net>
+
+	* examples/transport-configs/init-scripts/jabber-gg-transport:
+	Fixed typo (thanks to Sander Devrieze)
+
 2005-04-05  Alexey Shchepin  <alexey@sevcom.net>
 
 	* examples/transport-configs/configs/msn-transport.xml: Fixed typo
diff --git a/examples/transport-configs/init-scripts/jabber-gg-transport b/examples/transport-configs/init-scripts/jabber-gg-transport
index 17718fb93..269685d0d 100755
--- a/examples/transport-configs/init-scripts/jabber-gg-transport
+++ b/examples/transport-configs/init-scripts/jabber-gg-transport
@@ -33,8 +33,7 @@ case "$1" in
   stop)
 	echo "Stopping $NAME."
 	killall $NAME &
-# BUG REPORTEN hiervoor: bij afsluiten blijft telkens PID-bestand achter
-	rm $HOME/../../../var/run/jabber/jabber-gg-transport.pid
+	rm /var/run/jabber/jabber-gg-transport.pid
         ;;
 
   restart|reload)
diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c
index f320ee31f..fa47ed3f6 100644
--- a/src/tls/tls_drv.c
+++ b/src/tls/tls_drv.c
@@ -80,8 +80,8 @@ static int tls_drv_control(ErlDrvData handle,
 	 d->ctx = SSL_CTX_new(SSLv23_server_method());
 	 die_unless(d->ctx, "SSL_CTX_new failed");
 
-	 res = SSL_CTX_use_certificate_file(d->ctx, buf, SSL_FILETYPE_PEM);
-	 die_unless(res > 0, "SSL_CTX_use_certificate_file failed");
+	 res = SSL_CTX_use_certificate_chain_file(d->ctx, buf);
+	 die_unless(res > 0, "ssl_ctx_use_certificate_chain_file failed");
 
 	 res = SSL_CTX_use_PrivateKey_file(d->ctx, buf, SSL_FILETYPE_PEM);
 	 die_unless(res > 0, "SSL_CTX_use_PrivateKey_file failed");