diff --git a/compiler/i386/i386att.inc b/compiler/i386/i386att.inc
index b34c6193fe..c28c9f1fe6 100644
--- a/compiler/i386/i386att.inc
+++ b/compiler/i386/i386att.inc
@@ -676,7 +676,7 @@
 'aesdec',
 'aesdeclast',
 'aesimc',
-'aeskeygen',
+'aeskeygenassist',
 'stosq',
 'lodsq',
 'cmpsq'
diff --git a/compiler/x86/cpubase.pas b/compiler/x86/cpubase.pas
index 0d63031ba9..cfeab3f96f 100644
--- a/compiler/x86/cpubase.pas
+++ b/compiler/x86/cpubase.pas
@@ -52,7 +52,7 @@ uses
 {$endif x86_64}
 
       { This should define the array of instructions as string }
-      op2strtable=array[tasmop] of string[11];
+      op2strtable=array[tasmop] of string[15];
 
     const
       { First value of opcode enumeration }
diff --git a/compiler/x86/x86ins.dat b/compiler/x86/x86ins.dat
index 1c84d068af..66e0edcd4e 100644
--- a/compiler/x86/x86ins.dat
+++ b/compiler/x86/x86ins.dat
@@ -3700,7 +3700,7 @@ xmmreg,mem            \1\x66\301\331\3\x0F\x38\xDF\110               SSE4
 xmmreg,xmmreg         \1\x66\331\3\x0F\x38\xDB\110                   SSE4
 xmmreg,mem            \1\x66\301\331\3\x0F\x38\xDB\110               SSE4
 
-[AESKEYGEN] ;AESKEYGENASIST
+[AESKEYGEN,aeskeygenassist] ;AESKEYGENASIST
 (Ch_All, Ch_None, Ch_None)
 xmmreg,xmmreg,imm     \1\x66\331\3\x0F\x3A\xDF\110\26                SSE4
 xmmreg,mem,imm        \1\x66\301\331\3\x0F\x3A\xDF\110\26            SSE4
diff --git a/compiler/x86_64/x8664att.inc b/compiler/x86_64/x8664att.inc
index b34c6193fe..c28c9f1fe6 100644
--- a/compiler/x86_64/x8664att.inc
+++ b/compiler/x86_64/x8664att.inc
@@ -676,7 +676,7 @@
 'aesdec',
 'aesdeclast',
 'aesimc',
-'aeskeygen',
+'aeskeygenassist',
 'stosq',
 'lodsq',
 'cmpsq'