diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31f0325..36d0236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Several display/output fixes
 * Security fix: DNS input
 * Don't use external pwd anymore
+* STARTTLS: XMPP server support
 * Rating (SSL Labs, not complete)
 
 ### Features implemented / improvements in 3.0
diff --git a/CREDITS.md b/CREDITS.md
index 884d8dd..3c0cd24 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -143,6 +143,9 @@ Full contribution, see git log.
 * Dmitri S
   - inspiration & help for Darwin port
 
+* Jonas Schäfer
+  - XMPP server patch
+
 * Marcin Szychowski
   - Quick'n'dirty client certificate support