diff --git a/tools/qfcc/source/qp-parse.y b/tools/qfcc/source/qp-parse.y
index 08759a544..730eab57a 100644
--- a/tools/qfcc/source/qp-parse.y
+++ b/tools/qfcc/source/qp-parse.y
@@ -139,6 +139,29 @@ int yylex (void);
 %type	<op>		sign
 
 %{
+
+static void
+build_dotmain (symbol_t *program)
+{
+	symbol_t   *dotmain = new_symbol (".main");
+	expr_t     *code;
+	expr_t     *exitcode;
+
+	dotmain->params = 0;
+	dotmain->type = parse_params (&type_integer, 0);
+	dotmain->type = find_type (dotmain->type);
+	dotmain = function_symbol (dotmain, 0, 1);
+
+	exitcode = new_symbol_expr (symtab_lookup (current_symtab, "ExitCode"));
+
+	current_func = begin_function (dotmain, 0, current_symtab, 0);
+	current_symtab = current_func->symtab;
+	code = new_block_expr ();
+	append_expr (code, function_expr (new_symbol_expr (program), 0));
+	append_expr (code, return_expr (current_func, exitcode));
+	build_code_function (dotmain, 0, code);
+}
+
 %}
 
 %%
@@ -159,15 +182,7 @@ program
 			build_code_function ($1, 0, $4);
 			current_symtab = st;
 
-			$4 = function_expr (new_symbol_expr ($1), 0);
-			$1 = new_symbol (".main");
-			$1->params = 0;
-			$1->type = parse_params (&type_void, 0);
-			$1->type = find_type ($1->type);
-			$1 = function_symbol ($1, 0, 1);
-			current_func = begin_function ($1, 0, current_symtab, 0);
-			current_symtab = current_func->symtab;
-			build_code_function ($1, 0, $4);
+			build_dotmain ($1);
 			current_symtab = st;
 		}
 	;
@@ -178,6 +193,15 @@ program_head
 		{
 			$$ = $3;
 
+			// FIXME need units and standard units
+			{
+				symbol_t   *sym = new_symbol ("ExitCode");
+				sym->type = &type_integer;
+				initialize_def (sym, 0, current_symtab->space, sc_global);
+				if (sym->s.def) {
+					sym->s.def->nosave = 1;
+				}
+			}
 			$$->type = parse_params (&type_void, 0);
 			$$->type = find_type ($$->type);
 			$$ = function_symbol ($$, 0, 1);
@@ -375,6 +399,7 @@ statement
 else
 	: ELSE
 		{
+			// this is only to get the the file and line number info
 			$$ = new_nil_expr ();
 		}
 	;
diff --git a/tools/qfcc/test/gcd.pas b/tools/qfcc/test/gcd.pas
index 04e193b26..3879a3d3d 100644
--- a/tools/qfcc/test/gcd.pas
+++ b/tools/qfcc/test/gcd.pas
@@ -1,5 +1,5 @@
 program example (input, output);
-var x, y: integer;
+var x, y, g: integer;
 procedure printf (format:string; ...) := #0;
 function gcd (a, b: integer): integer;
 var c: quaternion;
@@ -11,5 +11,7 @@ end;
 begin
 	x := 130;
 	y := 120;
-	printf ("%d\n", gcd (x, y))
+	g := gcd (x, y);
+	printf ("%d\n", g);
+	ExitCode := g <> 10;
 end.