diff --git a/ChangeLog b/ChangeLog
index 1a1d0de15..46ef674a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ Bugfix
    * Fix compile error when POLARSSL_SSL_DISABLE_RENEGOTATION and
      POLARSSL_SSL_SSESSION_TICKETS where both enabled in config.h (introduced
      in 1.3.10).
+   * Add missing extern "C" guard in aesni.h (reported by amir zamani).
 
 Changes
    * ssl_set_own_cert() now longers calls pk_check_pair() since the
diff --git a/include/polarssl/aesni.h b/include/polarssl/aesni.h
index bb514ca6d..02419eda5 100644
--- a/include/polarssl/aesni.h
+++ b/include/polarssl/aesni.h
@@ -37,6 +37,10 @@
 
 #if defined(POLARSSL_HAVE_X86_64)
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * \brief          AES-NI features detection routine
  *
@@ -99,6 +103,10 @@ int aesni_setkey_enc( unsigned char *rk,
                       const unsigned char *key,
                       size_t bits );
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* POLARSSL_HAVE_X86_64 */
 
 #endif /* POLARSSL_AESNI_H */