diff --git a/ChangeLog b/ChangeLog
index f56b20479..3697f5310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ Bugfix
      curve picked by the server was actually allowed.
 
 Changes
+   * Options POLARSSL_HAVE_INT8 and POLARSSL_HAVE_INT16 are deprecated.
    * Enabling POLARSSL_NET_C without POLARSSL_HAVE_IPV6 is deprecated.
    * compat-1.2.h and openssl.h are deprecated.
    * Adjusting/overriding CFLAGS and LDFLAGS with the make build syste is now
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 76972dd02..6bfa705ba 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -44,6 +44,10 @@
  *
  * The system uses 8-bit wide native integers.
  *
+ * \deprecated The compiler should be able to generate code for 32-bit
+ * arithmetic (required by C89). This code is likely to be at least as
+ * efficient as ours.
+ *
  * Uncomment if native integers are 8-bit wide.
  */
 //#define POLARSSL_HAVE_INT8
@@ -53,6 +57,10 @@
  *
  * The system uses 16-bit wide native integers.
  *
+ * \deprecated The compiler should be able to generate code for 32-bit
+ * arithmetic (required by C89). This code is likely to be at least as
+ * efficient as ours.
+ *
  * Uncomment if native integers are 16-bit wide.
  */
 //#define POLARSSL_HAVE_INT16