diff --git a/ChangeLog b/ChangeLog
index e9a7de9..0bbe5b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+PolarSSL ChangeLog
+
+= Version 0.x released on 2009-01-??
+?   * Migrated XySSL to PolarSSL
+?   * Added warning for use of old defines
+?   * Added Camellia symmetric cipher
+?   * Added XTEA symmetric cipher
+?   * Fixed dangerous bug that can cause a heap overflow in
+     rsa_pkcs1_decrypt
+
+================================================================
+XySSL ChangeLog
 
 = Version 0.9 released on 2008-03-16
 
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index f32c228..d99702c 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -34,10 +34,10 @@
 #define SERVER_NAME "localhost"
 #define GET_REQUEST "GET / HTTP/1.0\r\n\r\n"
 */
-#define SERVER_NAME "xyssl.org"
+#define SERVER_NAME "polarssl.org"
 #define GET_REQUEST \
     "GET /hello/ HTTP/1.1\r\n" \
-    "Host: xyssl.org\r\n\r\n"
+    "Host: polarssl.org\r\n\r\n"
 
 #define DEBUG_LEVEL 0
 
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index e814931..d213093 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -36,10 +36,10 @@
 #define SERVER_NAME "localhost"
 #define GET_REQUEST "GET / HTTP/1.0\r\n\r\n"
 */
-#define SERVER_NAME "xyssl.org"
+#define SERVER_NAME "polarssl.org"
 #define GET_REQUEST \
     "GET /hello/ HTTP/1.1\r\n" \
-    "Host: xyssl.org\r\n\r\n"
+    "Host: polarssl.org\r\n\r\n"
 
 #define DEBUG_LEVEL 0