diff --git a/components/codetools/keywordfunclists.pas b/components/codetools/keywordfunclists.pas
index 46a4b4ce6b..224098eefb 100644
--- a/components/codetools/keywordfunclists.pas
+++ b/components/codetools/keywordfunclists.pas
@@ -916,6 +916,7 @@ begin
     Add('CASE',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('CLASS',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('CONST',{$ifdef FPC}@{$endif}AllwaysTrue);
+    Add('CONSTREF',{$ifdef FPC}@{$endif}AllwaysTrue); // is this really a keyword?
     Add('CONSTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('DESTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('DIV',{$ifdef FPC}@{$endif}AllwaysTrue);
@@ -988,6 +989,7 @@ begin
     Add('CASE',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('CLASS',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('CONST',{$ifdef FPC}@{$endif}AllwaysTrue);
+    Add('CONSTREF',{$ifdef FPC}@{$endif}AllwaysTrue); // is this really a keyword?
     Add('CONSTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('DESTRUCTOR',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('DIV',{$ifdef FPC}@{$endif}AllwaysTrue);
@@ -1047,7 +1049,6 @@ begin
   KeyWordLists.Add(AllKeyWords);
   AllKeyWords.Add(WordIsKeyWord);
   with AllKeyWords do begin
-    Add('END',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('PROPERTY',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('GENERIC',{$ifdef FPC}@{$endif}AllwaysTrue);
     Add('ON',{$ifdef FPC}@{$endif}AllwaysTrue);
diff --git a/components/codetools/pascalparsertool.pas b/components/codetools/pascalparsertool.pas
index 7b130e17db..183aa4e997 100644
--- a/components/codetools/pascalparsertool.pas
+++ b/components/codetools/pascalparsertool.pas
@@ -1299,7 +1299,7 @@ var CloseBracket: char;
   procedure ReadPrefixModifier;
   begin
     // read parameter prefix modifier
-    if UpAtomIs('VAR') or UpAtomIs('CONST')
+    if UpAtomIs('VAR') or UpAtomIs('CONST') or UpAtomIs('CONSTREF')
     or (UpAtomIs('OUT') and (Scanner.CompilerMode in [cmOBJFPC,cmDELPHI,cmFPC]))
     then begin
       Desc:=ctnVarDefinition;