diff --git a/parse.y b/parse.y
index ef7ef671..797936a3 100644
--- a/parse.y
+++ b/parse.y
@@ -123,7 +123,7 @@ typedef struct {
 
 %token	ACCESS ALIAS AUTO
 %token	BLOCK
-%token	CA CERT CHROOT CLIENT
+%token	CA CERT CGI CHROOT CLIENT
 %token	DEFAULT
 %token	FACILITY FASTCGI FOR_HOST
 %token	INCLUDE INDEX IPV6
@@ -384,6 +384,11 @@ servopt		: ALIAS string {
 			free(host->cert_path);
 			host->cert_path = $2;
 		}
+		| CGI string		{
+			free($2);
+			yyerror("`cgi' was removed in gmid 2.0."
+			    "  Please use fastcgi or proxy instead.");
+		}
 		| KEY string		{
 			ensure_absolute_path($2);
 			free(host->key_path);
@@ -651,6 +656,7 @@ static const struct keyword {
 	{"block", BLOCK},
 	{"ca", CA},
 	{"cert", CERT},
+	{"cgi", CGI},
 	{"chroot", CHROOT},
 	{"client", CLIENT},
 	{"default", DEFAULT},