diff --git a/NEWS b/NEWS
index 9bd7a11e..06ad4b1c 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,15 @@ Command-Line Interface
 
 Deprecated commands "part" and "search-tags" are removed.
 
+Vim Front-End
+-------------
+
+The vim based front end to notmuch is deprecated and moved to contrib.
+We haven't been able to support this as well as we would like, and it
+has accumulated bugs and gaps in functionality.  We recommend that
+people packaging notmuch no longer provide binary packages for
+notmuch-vim, but of course that is their decision.
+
 Notmuch 0.15.1 (2013-01-24)
 =========================
 
diff --git a/vim/Makefile b/contrib/notmuch-vim/Makefile
similarity index 100%
rename from vim/Makefile
rename to contrib/notmuch-vim/Makefile
diff --git a/vim/README b/contrib/notmuch-vim/README
similarity index 100%
rename from vim/README
rename to contrib/notmuch-vim/README
diff --git a/vim/notmuch.yaml b/contrib/notmuch-vim/notmuch.yaml
similarity index 100%
rename from vim/notmuch.yaml
rename to contrib/notmuch-vim/notmuch.yaml
diff --git a/vim/plugin/notmuch.vim b/contrib/notmuch-vim/plugin/notmuch.vim
similarity index 100%
rename from vim/plugin/notmuch.vim
rename to contrib/notmuch-vim/plugin/notmuch.vim
diff --git a/vim/syntax/notmuch-compose.vim b/contrib/notmuch-vim/syntax/notmuch-compose.vim
similarity index 100%
rename from vim/syntax/notmuch-compose.vim
rename to contrib/notmuch-vim/syntax/notmuch-compose.vim
diff --git a/vim/syntax/notmuch-folders.vim b/contrib/notmuch-vim/syntax/notmuch-folders.vim
similarity index 100%
rename from vim/syntax/notmuch-folders.vim
rename to contrib/notmuch-vim/syntax/notmuch-folders.vim
diff --git a/vim/syntax/notmuch-git-diff.vim b/contrib/notmuch-vim/syntax/notmuch-git-diff.vim
similarity index 100%
rename from vim/syntax/notmuch-git-diff.vim
rename to contrib/notmuch-vim/syntax/notmuch-git-diff.vim
diff --git a/vim/syntax/notmuch-search.vim b/contrib/notmuch-vim/syntax/notmuch-search.vim
similarity index 100%
rename from vim/syntax/notmuch-search.vim
rename to contrib/notmuch-vim/syntax/notmuch-search.vim
diff --git a/vim/syntax/notmuch-show.vim b/contrib/notmuch-vim/syntax/notmuch-show.vim
similarity index 100%
rename from vim/syntax/notmuch-show.vim
rename to contrib/notmuch-vim/syntax/notmuch-show.vim