diff --git a/ruamoko/lib/Entity.r b/ruamoko/lib/Entity.r
index 474bc3db1..e2ea25000 100644
--- a/ruamoko/lib/Entity.r
+++ b/ruamoko/lib/Entity.r
@@ -9,7 +9,7 @@
 typedef void () void_function;
 
 int PR_SetField (entity ent, string field, string value) = #0;
-function PR_FindFunction (string func) = #0;
+@function PR_FindFunction (string func) = #0;
 
 @static void ParseEntities (string ent_data);
 
@@ -66,7 +66,7 @@ function PR_FindFunction (string func) = #0;
 	local int count;
 	local string field, value;
 	local plitem_t keys;
-	local function func;
+	local @function func;
 	local Entity *e;
 
 	classname = PL_String (PL_ObjectForKey (dict, "classname"));
diff --git a/tools/qfcc/source/qc-lex.l b/tools/qfcc/source/qc-lex.l
index 3406380ef..cccc43afd 100644
--- a/tools/qfcc/source/qc-lex.l
+++ b/tools/qfcc/source/qc-lex.l
@@ -378,8 +378,8 @@ static keyword_t qf_keywords[] = {
 	{"double",		TYPE,	&type_double},
 	{"int",			TYPE,	&type_integer	},
 	{"unsigned",	TYPE,	&type_integer	},//FIXME
-	{"function",	TYPE,	&type_function	},
 
+	{"@function",	TYPE,	&type_function	},
 	{"@args",		ARGS,	0				},
 	{"@va_list",	TYPE,	&type_va_list	},
 	{"@param",		TYPE,	&type_param		},