diff --git a/CHANGELOG.md b/CHANGELOG.md
index 492355b..8c612db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.7.0 - Split grammar definitions
+- Create seperate definitions for FlatZinc + Output models and DZN files.
+- Fixes linting error when opening DZN files
+
 ## 0.6.1 - Moved repository
 - Change the repository URL
 
diff --git a/grammars/dzn.cson b/grammars/dzn.cson
new file mode 100644
index 0000000..4dde396
--- /dev/null
+++ b/grammars/dzn.cson
@@ -0,0 +1,12 @@
+'scopeName': 'source.dzn'
+'name': 'MiniZinc Data File'
+'comment': 'MiniZinc data files contain the values of parameters declared in a MiniZinc model.'
+'fileTypes': [
+  'dzn'
+]
+
+'patterns': [
+  {
+    'include': 'source.mzn'
+  }
+]
diff --git a/grammars/fzn.cson b/grammars/fzn.cson
new file mode 100644
index 0000000..043a456
--- /dev/null
+++ b/grammars/fzn.cson
@@ -0,0 +1,13 @@
+'scopeName': 'source.fzn'
+'name': 'FlatZinc'
+'comment': 'FlatZinc is the target constraint modelling language into which MiniZinc models are translated'
+'fileTypes': [
+  'fzn'
+  'ozn'
+]
+
+'patterns': [
+  {
+    'include': 'source.mzn'
+  }
+]
diff --git a/grammars/mzn.cson b/grammars/mzn.cson
index 25dea99..8257e1e 100644
--- a/grammars/mzn.cson
+++ b/grammars/mzn.cson
@@ -3,7 +3,6 @@
 'comment': 'The MiniZinc medium level constraint modeling language'
 'fileTypes': [
   'mzn'
-  'dzn'
 ]
 
 'patterns':[