diff --git a/Parser.cpp b/Parser.cpp
index 9941fbf43..d936cfc72 100644
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -381,7 +381,6 @@ ASTPointer<ForStatement> Parser::parseForStatement()
 	ASTPointer<Expression> conditionExpression = parseExpression();
 	expectToken(Token::SEMICOLON);
 	ASTPointer<ExpressionStatement> loopExpression = parseExpressionStatement();
-	expectToken(Token::SEMICOLON);
 	expectToken(Token::RPAREN);
 	ASTPointer<Statement> body = parseStatement();
 	nodeFactory.setEndPositionFromNode(body);
diff --git a/grammar.txt b/grammar.txt
index 99a590014..76e7bb6b6 100644
--- a/grammar.txt
+++ b/grammar.txt
@@ -20,7 +20,7 @@ Statement = IfStatement | WhileStatement | Block |
 
 IfStatement = 'if' '(' Expression ')' Statement ( 'else' Statement )?
 WhileStatement = 'while' '(' Expression ')' Statement
-ForStatement = 'for' '(' Expressionstatement Expression Expressionstatement ')' Statement
+ForStatement = 'for' '(' VardefOrExpressionstatement ';' Expression ';' Expressionstatement ')' Statement
 Continue = 'continue' ';'
 Break = 'break' ';'
 Return = 'return' Expression? ';'