diff --git a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
index be7f077..41e5b07 100644
--- a/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
+++ b/com.google.eclipse.protobuf/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@
  com.google.eclipse.protobuf.services,
  com.google.eclipse.protobuf.util,
  com.google.eclipse.protobuf.validation
+
diff --git a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
index 0f0c32e..1f00280 100644
--- a/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
+++ b/com.google.eclipse.protobuf/src/com/google/eclipse/protobuf/Protobuf.xtext
@@ -42,11 +42,13 @@
 Message:
   'message' name=Name '{'
   elements+=MessageElement*
-  ('extensions' extensionsFrom=INT 'to' (extensionsTo=INT | 'max') ';')?
   '}'(';')?;
 
 MessageElement:
-  Type | Field | ExtendMessage | Option;
+  Extensions | Type | Field | ExtendMessage | Option;
+
+Extensions:
+  'extensions' extensionsFrom=INT 'to' (extensionsTo=INT | 'max') ';';
 
 Field:
   Property | Group;
@@ -107,6 +109,7 @@
   LiteralRef
   | BooleanRef
   | IntRef
+  | LongRef
   | FloatRef
   | DoubleRef
   | StringRef
@@ -124,6 +127,10 @@
 
 IntRef:
   int=INT;
+  
+LongRef:
+  long=LONG;
+
 
 FloatRef:
   float=FLOAT;
@@ -170,6 +177,7 @@
   type=[Message | QualifiedName];
 
 terminal INT returns ecore::EInt: ('-')? ('0'..'9')+;  
+terminal LONG returns ecore::ELong: ('-')? ('0'..'9')+;  
 terminal FLOAT returns ecore::EFloat: ('-')? ('0'..'9')* ('.' ('0'..'9')+)?;
 terminal DOUBLE returns ecore::EDouble: ('-')? ('0'..'9')* ('.' ('0'..'9')+)?;
   
\ No newline at end of file