diff --git a/debian/changelog b/debian/changelog
index 1177f085..3a792518 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+notmuch (0.38.3-3) unstable; urgency=medium
+
+  [ James McCoy ]
+  * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936).
+
+  [ Nicholas D Steeves ]
+  * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add
+    related Enhances (Closes: #1029190).
+  * Add Astroid as an alternative Recommends; this one is a GUI client that
+    may be less intimidating for new users.
+
+  [ David Bremner ]
+  * remove "Build-Conflicts: gdb-minimal", thanks to Jeremy Bícha (Closes:
+    #1077911).
+  * skip test T810-tsan everywhere, as it seems broken by the latest glib
+    (Closes: #1077910). Thanks to Jeremy Bícha for the report
+  * Replace build-dependency on pkg-config with pkgconf
+
+ -- David Bremner <bremner@debian.org>  Mon, 05 Aug 2024 10:13:01 -0300
+
+notmuch (0.38.3-2) unstable; urgency=medium
+
+  * No change upload to rebuild with dh-elpa 2.1.5
+
+ -- David Bremner <bremner@debian.org>  Fri, 26 Jul 2024 11:59:41 +0900
+
 notmuch (0.38.3-1) unstable; urgency=medium
 
   * New upstream bugfix release
diff --git a/debian/control b/debian/control
index 4fded909..08e3c7f3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,13 +7,13 @@ Uploaders:
  David Bremner <bremner@debian.org>,
 Build-Conflicts:
  gdb [ia64 mips mips64el hppa],
- gdb-minimal,
  ruby1.8,
 Build-Depends: dpkg-dev (>= 1.22.5),
  bash-completion (>=1.9.0~),
  debhelper-compat (= 13),
  dh-elpa (>= 1.3),
  dh-python,
+ dh-sequence-vim-addon,
  desktop-file-utils,
  doxygen,
  dpkg-dev (>= 1.17.14),
@@ -30,7 +30,7 @@ Build-Depends: dpkg-dev (>= 1.22.5),
  libtalloc-dev,
  libxapian-dev,
  libz-dev,
- pkg-config,
+ pkgconf,
  python3,
  python3-cffi,
  python3-pytest,
@@ -54,7 +54,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
+ elpa-notmuch | notmuch-vim | notmuch-mutt | alot | astroid,
  gpg-agent,
  gpgsm,
 Suggests:
@@ -211,9 +211,9 @@ Replaces:
 Depends:
  notmuch,
  ruby-notmuch,
- vim-addon-manager,
  vim-ruby,
  ${misc:Depends},
+ ${vim-addon:Depends},
 Recommends:
  ruby-mail,
 Description: thread-based email index, search and tagging (vim interface)
@@ -235,9 +235,10 @@ Depends:
  ${misc:Depends},
  ${perl:Depends},
 Recommends:
- mutt,
+ mutt | neomutt,
 Enhances:
  mutt,
+ neomutt,
  notmuch,
 Description: thread-based email index, search and tagging (Mutt interface)
  notmuch-mutt provides integration among the Mutt mail user agent and
diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs
deleted file mode 100644
index 2b531314..00000000
--- a/debian/notmuch-vim.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/vim/addons/doc
-usr/share/vim/addons/plugin
-usr/share/vim/addons/syntax
-usr/share/vim/registry
diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install
index cf898738..08096d37 100644
--- a/debian/notmuch-vim.install
+++ b/debian/notmuch-vim.install
@@ -1,4 +1 @@
-vim/notmuch.txt usr/share/vim/addons/doc
-vim/notmuch.vim usr/share/vim/addons/plugin
-vim/notmuch.yaml usr/share/vim/registry
-vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
+/usr/share/notmuch-vim
diff --git a/debian/notmuch-vim.neovim-addon b/debian/notmuch-vim.neovim-addon
new file mode 120000
index 00000000..a576db7c
--- /dev/null
+++ b/debian/notmuch-vim.neovim-addon
@@ -0,0 +1 @@
+notmuch-vim.vim-addon
\ No newline at end of file
diff --git a/debian/notmuch-vim.vim-addon b/debian/notmuch-vim.vim-addon
new file mode 100644
index 00000000..9c23ba18
--- /dev/null
+++ b/debian/notmuch-vim.vim-addon
@@ -0,0 +1 @@
+/usr/share/notmuch-vim notmuch
diff --git a/debian/rules b/debian/rules
index a77ffa15..41f70298 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,7 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/architecture.mk
 
-ifeq ($(DEB_HOST_ARCH),ppc64el)
-	export NOTMUCH_SKIP_TESTS = T810-tsan
-endif
+export NOTMUCH_SKIP_TESTS = T810-tsan
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
@@ -37,4 +35,5 @@ override_dh_auto_install:
 	PYBUILD_NAME=notmuch dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python
 	PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi
 	$(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C vim prefix=/usr/share/notmuch-vim DESTDIR=$(CURDIR)/debian/tmp install
 	dh_auto_install --sourcedirectory bindings/ruby
diff --git a/debian/tests/control b/debian/tests/control
index 80be1deb..11aebad9 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,7 +1,7 @@
 Test-command: env NOTMUCH_TEST_INSTALLED=1 TERM=dumb
     NOTMUCH_HAVE_MAN=1 NOTMUCH_HAVE_SFSEXP=1 NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=1
     NOTMUCH_HAVE_PYTHON3_CFFI=1 NOTMUCH_HAVE_PYTHON3_PYTEST=1
-    NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1
+    NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1 NOTMUCH_SKIP_TESTS=T810-tsan
     ./test/notmuch-test
 Restrictions: allow-stderr
 Architecture: amd64, arm64