diff --git a/library/aes.c b/library/aes.c
index 4477084..331698f 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -483,6 +483,15 @@
 #endif
     ctx->rk = RK = ctx->buf;
 
+#if defined(POLARSSL_AESNI_C) && defined(POLARSSL_HAVE_X86_64)
+    if( aesni_supports( POLARSSL_AESNI_AES ) )
+    {
+        int ret = aesni_setkey_enc( (unsigned char *) ctx->rk, key, keysize );
+        // XXX: temporary while some key size aren't handled
+        if( ret == 0 ) return( ret );
+    }
+#endif
+
     for( i = 0; i < (keysize >> 5); i++ )
     {
         GET_UINT32_LE( RK[i], key, i << 2 );