diff -pruN 20210124.5/debian/changelog 20210124.5+nmu1/debian/changelog
--- 20210124.5/debian/changelog	2025-09-14 02:00:26.000000000 +0000
+++ 20210124.5+nmu1/debian/changelog	2025-09-18 06:54:10.000000000 +0000
@@ -1,3 +1,11 @@
+vim-scripts (20210124.5+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Move from cdbs to dh. (Closes: #1007366)
+  * Drop non-existing Suggests: perlsgml.
+
+ -- Bastian Germann <bage@debian.org>  Thu, 18 Sep 2025 08:54:10 +0200
+
 vim-scripts (20210124.5) unstable; urgency=medium
 
   * Pass --nonet to xsltproc, so it does not try to use the network
diff -pruN 20210124.5/debian/clean 20210124.5+nmu1/debian/clean
--- 20210124.5/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ 20210124.5+nmu1/debian/clean	2025-09-18 06:54:10.000000000 +0000
@@ -0,0 +1,2 @@
+dtd2vim.1
+vimplate.1
diff -pruN 20210124.5/debian/control 20210124.5+nmu1/debian/control
--- 20210124.5/debian/control	2025-09-14 02:00:26.000000000 +0000
+++ 20210124.5+nmu1/debian/control	2025-09-18 06:54:10.000000000 +0000
@@ -3,7 +3,7 @@ Section: editors
 Priority: optional
 Maintainer: Debian Vim Maintainers <team+vim@tracker.debian.org>
 Uploaders: James McCoy <jamessan@debian.org>
-Build-Depends: cdbs, debhelper (>> 10), dh-vim-addon, quilt
+Build-Depends: debhelper (>> 10), dh-vim-addon, quilt
 Build-Depends-Indep: xsltproc, docbook-xsl
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
@@ -14,7 +14,7 @@ Vcs-Browser: https://salsa.debian.org/vi
 Package: vim-scripts
 Architecture: all
 Depends: ${misc:Depends}, ${vim-addon:Depends}
-Suggests: perlsgml, libtemplate-perl, ctags
+Suggests: libtemplate-perl, ctags
 Description: plugins for vim, adding bells and whistles
  Vim is a very capable editor. Its scripting support allows the use of plugins
  that enhance the functionality of it. Many people have written scripts, they
diff -pruN 20210124.5/debian/rules 20210124.5+nmu1/debian/rules
--- 20210124.5/debian/rules	2025-09-14 02:00:26.000000000 +0000
+++ 20210124.5+nmu1/debian/rules	2025-09-18 06:54:10.000000000 +0000
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-common-build-indep:: debian/stamp-local-build
-debian/stamp-local-build:: copyright dtd2vim.1 vimplate.1
-	touch $@
+%:
+	dh $@ --with quilt
 
-common-binary-post-install-indep::
+execute_before_dh_auto_build: copyright dtd2vim.1 vimplate.1
+
+execute_after_dh_install-indep:
 	# Rename to match the name specified in g:colors_name
 	mv debian/vim-scripts/usr/share/vim-scripts/color_sampler_pack/colors/Mustang.vim debian/vim-scripts/usr/share/vim-scripts/color_sampler_pack/colors/mustang.vim
 	# This is provided by vim-solarized
@@ -26,8 +25,3 @@ dtd2vim.1: debian/dtd2vim.xml
 	xsltproc --nonet /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl $<
 vimplate.1: vimplate/bin/vimplate
 	pod2man $< $@
-
-clean:: local-clean
-local-clean::
-	rm -f dtd2vim.1 vimplate.1
-	rm -f debian/stamp-local-build