diff --git a/ChangeLog b/ChangeLog
index b3e5fb9822..4e9f6c2308 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 PolarSSL ChangeLog
 
+= Version Master
+Changes
+   * Added p_hw_data to ssl_context for context specific hardware acceleration
+     data
+
 = Version 1.2.1 released 2012-11-20
 Changes
    * Depth that the certificate verify callback receives is now numbered
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 2020d3168f..bcc84287c4 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -415,6 +415,7 @@ struct _ssl_context
     void *p_get_cache;          /*!< context for cache retrieval      */
     void *p_set_cache;          /*!< context for cache store          */
     void *p_sni;                /*!< context for SNI extension        */
+    void *p_hw_data;            /*!< context for HW acceleration      */
 
     /*
      * Session layer