diff --git a/vim-plugins.changes b/vim-plugins.changes
index c08b64a..08d5447 100644
--- a/vim-plugins.changes
+++ b/vim-plugins.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Dec 11 14:29:18 UTC 2015 - astieger@suse.com
+
+- add vim-plugin-editorconfig supporting EditorConfig
+
 -------------------------------------------------------------------
 Fri Nov 27 10:51:45 UTC 2015 - astieger@suse.com
 
diff --git a/vim-plugins.spec b/vim-plugins.spec
index 1f199c3..399fb66 100644
--- a/vim-plugins.spec
+++ b/vim-plugins.spec
@@ -49,6 +49,7 @@
 %define		rails_version			4.4
 %define		ack_version			1.0.8
 %define		ag_version			20150518
+%define		editorconfig_version		0.3.2
 
 Name:           vim-plugins
 Version:        7.2.22
@@ -90,6 +91,7 @@ Source30:       vimplugin-snipmate-%{snipmate_version}.tar.bz2
 Source31:       vimplugin-rails-%{rails_version}.tar.bz2
 Source32:       https://github.com/mileszs/ack.vim/archive/%{ack_version}.tar.gz#/vimplugin-ack-%{ack_version}.tar.gz
 Source33:       vimplugin-ag-%{ag_version}.tar.bz2
+Source34:       https://github.com/editorconfig/editorconfig-vim/archive/v%{editorconfig_version}.tar.gz#/vimplugin-editorconfig-%{editorconfig_version}.tar.gz
 Source100:      https://raw.githubusercontent.com/openSUSE/pack-tools/master/contrib/vim/spec.snippets
 Patch1:         locateopen-1.3-locate-support.patch
 BuildRequires:  vim
@@ -561,8 +563,26 @@ Requires:       the_silver_searcher
 %description -n vim-plugin-ag
 Run the ack search tool from Vim, with enhanced results listing.
 
+%package -n vim-plugin-editorconfig
+
+Version:        %editorconfig_version
+Release:        0
+Summary:        EditorConfig plugin for Vim
+License:        BSD-2-Clause
+Group:          Productivity/Text/Editors
+Requires:       editorconfig
+
+%description -n vim-plugin-editorconfig
+EditorConfig helps developers define and maintain consistent coding styles between 
+different editors and IDEs. The EditorConfig project consists of a file format for 
+defining coding styles and a collection of text editor plugins that enable editors 
+to read the file format and adhere to defined styles. EditorConfig files are 
+easily readable and they work nicely with version control systems.
+
+This package contains a Vim plugin to support EditorConfig.
+
 %prep
-%setup -q -c -n %{name} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33
+%setup -q -c -n %{name} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33 -a34
 # ------- patch locateopen ------
 pushd vimplugin-locateopen-%locateopen_version
 %patch1
@@ -585,6 +605,15 @@ pushd ack.vim-%{ack_version}
 cp -a autoload doc plugin %{buildroot}/%{vimplugin_dir}
 # vim-plugin-latext creates ftplugin
 cp -a ftplugin/qf.vim %{buildroot}%{vimplugin_dir}/ftplugin/
+popd
+
+# vim-plugin-editorconfig
+pushd editorconfig-vim-%{editorconfig_version}
+rm -rf plugin/editorconfig-core-py/ tests/
+rm mkzip.sh README.md LICENSE CONTRIBUTORS
+mkdir -p %buildroot/%vimplugin_dir
+cp -a * %buildroot/%vimplugin_dir/
+popd
 
 cp %{SOURCE100} %{buildroot}/%vimplugin_dir/snippets/
 
@@ -819,6 +848,16 @@ if [ $1 == 0 ]; then
   vim -u NONE -U NONE -X -n '+set nobackup nomore' '+helptags %vimplugin_dir/doc/' '+qa!' < /dev/null &> /dev/null
 fi
 
+# documentation: vim-plugin-editorconfig
+
+%post -n vim-plugin-editorconfig
+vim -u NONE -U NONE -X -n '+set nobackup nomore' '+helptags %vimplugin_dir/doc/' '+qa!' < /dev/null &> /dev/null
+
+%postun -n vim-plugin-editorconfig
+if [ $1 == 0 ]; then
+  vim -u NONE -U NONE -X -n '+set nobackup nomore' '+helptags %vimplugin_dir/doc/' '+qa!' < /dev/null &> /dev/null
+fi
+
 %post
 vim -u NONE -U NONE -X -n '+set nobackup nomore' '+helptags %vimplugin_dir/doc/' '+qa!' < /dev/null &> /dev/null
 
@@ -1033,4 +1072,10 @@ fi
 %vimplugin_dir/autoload/ag.vim
 %vimplugin_dir/doc/ag.txt
 
+%files -n vim-plugin-editorconfig
+%defattr(-,root,root,0755)
+%vimplugin_dir/plugin/editorconfig.vim
+%vimplugin_dir/autoload/editorconfig.vim
+%vimplugin_dir/doc/editorconfig.txt
+
 %changelog
diff --git a/vimplugin-editorconfig-0.3.2.tar.gz b/vimplugin-editorconfig-0.3.2.tar.gz
new file mode 100644
index 0000000..6f52d86
--- /dev/null
+++ b/vimplugin-editorconfig-0.3.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:841661603c94cb0e259734576b5eca3d21692ff5543a25d83526a16d3a65d4a3
+size 40062