diff --git a/ChangeLog b/ChangeLog
index 4e2d97be5..6d4228f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 PolarSSL ChangeLog (Sorted per branch, date)
 
+ABI Alert: ALPN changes the ABI for the next release.
+
 = PolarSSL 1.3 branch
 
+Features
+   * Support for the ALPN SSL extension
+
 Changes
    * x509_crt_info() now prints information about parsed extensions as well
 
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index f6ea78cdd..223fce382 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -866,12 +866,9 @@
  * Enable support for Application Layer Protocol Negotiation.
  * draft-ietf-tls-applayerprotoneg-05
  *
- * This is disabled by default in the 1.3.x line since it breaks ABI
- * compatibility.
- *
- * Uncomment this macro to enable support for ALPN.
+ * Comment this macro to disable support for ALPN.
  */
-//#define POLARSSL_SSL_ALPN
+#define POLARSSL_SSL_ALPN
 
 /**
  * \def POLARSSL_SSL_SESSION_TICKETS