diff --git a/include/ChangeLog b/include/ChangeLog
index f647c7332..e7db18284 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-13  David Shaw  <dshaw@jabberwocky.com>
+
+	* cipher.h: Add AES aliases for RIJNDAEL algo numbers.
+
 2002-08-07  David Shaw  <dshaw@jabberwocky.com>
 
 	* cipher.h: Add md_algo_present().
diff --git a/include/cipher.h b/include/cipher.h
index 992532df6..5a8982244 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -33,9 +33,12 @@
 #define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
 #define CIPHER_ALGO_SAFER_SK128  5
 #define CIPHER_ALGO_DES_SK	 6
-#define CIPHER_ALGO_RIJNDAEL     7
-#define CIPHER_ALGO_RIJNDAEL192  8
-#define CIPHER_ALGO_RIJNDAEL256  9
+#define CIPHER_ALGO_AES          7
+#define CIPHER_ALGO_AES192       8
+#define CIPHER_ALGO_AES256       9
+#define CIPHER_ALGO_RIJNDAEL     CIPHER_ALGO_AES
+#define CIPHER_ALGO_RIJNDAEL192  CIPHER_ALGO_AES192
+#define CIPHER_ALGO_RIJNDAEL256  CIPHER_ALGO_AES256
 #define CIPHER_ALGO_TWOFISH	10  /* twofish 256 bit */
 #define CIPHER_ALGO_SKIPJACK   101  /* experimental: skipjack */
 #define CIPHER_ALGO_TWOFISH_OLD 102 /* experimental: twofish 128 bit */