diff --git a/python-Jinja2.changes b/python-Jinja2.changes
index aee5256..4d10202 100644
--- a/python-Jinja2.changes
+++ b/python-Jinja2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 22 12:00:51 UTC 2011 - saschpe@suse.de
+
+- Split of 'vim' and 'emacs' sub-packages that contain syntax highlighting
+  support for both editors
+
 -------------------------------------------------------------------
 Thu Sep 22 09:13:19 UTC 2011 - saschpe@suse.de
 
diff --git a/python-Jinja2.spec b/python-Jinja2.spec
index 9d2811d..01851cf 100644
--- a/python-Jinja2.spec
+++ b/python-Jinja2.spec
@@ -56,6 +56,23 @@ sandboxed environment.  Here a small example of a Jinja template:
       </ul>
     {% endblock %}
 
+%package vim
+Summary:        Jinja2 syntax files for Vim
+Group:          Productivity/Text/Editors
+Requires:       %{name} = %{version}
+
+%description vim
+Vim syntax highlighting scheme for Jinja2 templates.
+
+%package emacs
+Summary:        Jinja2 syntax files for Emacs
+License:        GPL-2.0+
+Group:          Productivity/Text/Editors
+Requires:       %{name} = %{version}
+
+%description emacs
+Emacs syntax highlighting scheme for Jinja2 templates.
+
 %prep
 %setup -q -n Jinja2-%{version}
 
@@ -65,13 +82,23 @@ sed -i 's/\r$//' LICENSE # Fix wrong EOL encoding
 
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+install -Dm644 ext/Vim/jinja.vim %{buildroot}%{_datadir}/vim/site/syntax/jinja.vim # Install VIM syntax file
+install -Dm644 ext/jinja.el %{buildroot}%{_datadir}/emacs/site-lisp/jinja.el # Install Emacs syntax file
 %if 0%{?suse_version} > 1010
 %fdupes %{buildroot}%{_prefix}
 %endif
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS CHANGES LICENSE artwork examples ext
+%doc AUTHORS CHANGES LICENSE artwork examples ext/JinjaTemplates.tmbundle.tar.gz
 %{python_sitelib}/*
 
+%files vim
+%defattr(-,root,root,-)
+%{_datadir}/vim/site/syntax/jinja.vim
+
+%files emacs
+%defattr(-,root,root,-)
+%{_datadir}/emacs/site-lisp/jinja.el
+
 %changelog