diff --git a/debian/changelog b/debian/changelog
index efeaf2a3..9eb213b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-snapshot (1:3.7~svn231060-1~exp2) UNRELEASED; urgency=medium
+
+  * Reflect upstream changes wrt vim package. Split the files into different
+    directories
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 21 Apr 2015 09:41:41 +0200
+
 llvm-toolchain-snapshot (1:3.7~svn231060-1~exp1) experimental; urgency=medium
 
   * New snapshot release
diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in
index 11e504e2..ae667c40 100644
--- a/debian/llvm-X.Y-dev.install.in
+++ b/debian/llvm-X.Y-dev.install.in
@@ -15,8 +15,19 @@ Makefile.rules			        /usr/lib/llvm-@LLVM_VERSION@/build/
 configure			            /usr/lib/llvm-@LLVM_VERSION@/build/
 autoconf/			            /usr/lib/llvm-@LLVM_VERSION@/build/
 
-utils/vim/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/syntax/
-utils/vim/tablegen-@LLVM_VERSION@.vim		    usr/share/vim/addons/syntax/
+utils/vim/indent/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/indent/
+
+utils/vim/syntax/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/syntax/
+utils/vim/syntax/tablegen-@LLVM_VERSION@.vim		    usr/share/vim/addons/syntax/
+
+utils/vim/ftdetect/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/ftdetect/
+utils/vim/ftdetect/tablegen-@LLVM_VERSION@.vim		    usr/share/vim/addons/ftdetect/
+
+utils/vim/ftplugin/llvm-@LLVM_VERSION@.vim		        usr/share/vim/addons/ftplugin/
+utils/vim/ftplugin/tablegen-@LLVM_VERSION@.vim		    usr/share/vim/addons/ftplugin/
+
+utils/vim/llvm-$(LLVM_VERSION)-vimrc		            usr/share/vim/addons
+
 
 utils/emacs/emacs.el		    usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/
 utils/emacs/llvm-mode.el	    usr/share/emacs/site-lisp/llvm-@LLVM_VERSION@/
diff --git a/debian/rules b/debian/rules
index f45423ed..0f5bd959 100755
--- a/debian/rules
+++ b/debian/rules
@@ -304,9 +304,15 @@ override_dh_auto_install:
 
 	cp $(CURDIR)/clang/tools/scan-build/scan-build.1 $(CURDIR)/clang/tools/scan-build/scan-build-$(LLVM_VERSION).1
 
-	cp -f $(CURDIR)/utils/vim/llvm.vim $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION).vim
-
-	cp -f $(CURDIR)/utils/vim/tablegen.vim $(CURDIR)/utils/vim/tablegen-$(LLVM_VERSION).vim
+	# copy the vim files (exept that tablegen does not exist for indent
+	VIM_DIRS="ftdetect ftplugin syntax indent"; \
+	for dir in $$VIM_DIRS; do \
+		cp -f $(CURDIR)/utils/vim/$$dir/llvm.vim $(CURDIR)/utils/vim/$$dir/llvm-$(LLVM_VERSION).vim; \
+		if test -f $(CURDIR)/utils/vim/$$dir/tablegen.vim; then \
+			cp -f $(CURDIR)/utils/vim/$$dir/tablegen.vim $(CURDIR)/utils/vim/$$dir/tablegen-$(LLVM_VERSION).vim; \
+		fi; \
+	done
+	cp -f $(CURDIR)/utils/vim/vimrc $(CURDIR)/utils/vim/llvm-$(LLVM_VERSION)-vimrc
 
 	cp -f $(CURDIR)/clang/tools/clang-format/clang-format-diff.py $(CURDIR)/clang/tools/clang-format/clang-format-diff-$(LLVM_VERSION)