diff -Nru wl-2.15.9+0.20190205/debian/changelog wl-2.15.9+0.20190205/debian/changelog
--- wl-2.15.9+0.20190205/debian/changelog	2020-03-07 03:30:12.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/changelog	2020-08-24 14:22:25.000000000 +0000
@@ -1,3 +1,13 @@
+wl (2.15.9+0.20190205-4) unstable; urgency=medium
+
+  * Add debian/upstream/metadata
+  * Update debian/watch to stable/wl-beta
+  * Update debhelper-compat to 13
+  * No longer recompile mhc
+  * No longer handle CVS stuff
+
+ -- Tatsuya Kinoshita <tats@debian.org>  Mon, 24 Aug 2020 23:22:25 +0900
+
 wl (2.15.9+0.20190205-3) unstable; urgency=medium
 
   * Update configration for GnuTLS and NSM
diff -Nru wl-2.15.9+0.20190205/debian/control wl-2.15.9+0.20190205/debian/control
--- wl-2.15.9+0.20190205/debian/control	2020-03-07 03:28:22.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/control	2020-08-24 14:17:09.000000000 +0000
@@ -2,7 +2,7 @@
 Section: lisp
 Priority: optional
 Maintainer: Tatsuya Kinoshita <tats@debian.org>
-Build-Depends: debhelper-compat (= 12)
+Build-Depends: debhelper-compat (= 13)
 Build-Depends-Indep: emacs-nox | emacs | emacs25 | emacs24 | emacs23 | emacs22, apel (>= 10.7), flim, semi
 Standards-Version: 4.5.0
 Vcs-Browser: https://salsa.debian.org/debian/wl
diff -Nru wl-2.15.9+0.20190205/debian/emacsen-install.in wl-2.15.9+0.20190205/debian/emacsen-install.in
--- wl-2.15.9+0.20190205/debian/emacsen-install.in	2019-07-15 14:02:53.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/emacsen-install.in	2020-08-24 14:17:46.000000000 +0000
@@ -177,14 +177,5 @@
 echo "install/$PACKAGE: deleting $LOG"
 rm -f "$LOG"
 
-echo "install/$PACKAGE: byte-compiling for reverse dependency"
-pkg=mhc
-dir=/usr/share/$FLAVOR/site-lisp/$pkg
-inst=/usr/lib/emacsen-common/packages/install/$pkg
-if [ -d "$dir" ] && [ -f "$inst" ]; then
-    rm -f "$dir"/*.elc "$dir"/*-stamp
-    "$inst" "$FLAVOR"
-fi
-
 touch "$ELCSTAMP"
 exit 0
diff -Nru wl-2.15.9+0.20190205/debian/rules wl-2.15.9+0.20190205/debian/rules
--- wl-2.15.9+0.20190205/debian/rules	2018-06-03 09:44:37.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/rules	2020-08-24 14:18:19.000000000 +0000
@@ -59,8 +59,6 @@
 	dh_link usr/share/pixmaps/$(PKGSNAME) usr/share/$(PKGSNAME)/etc/icons
 	dh_link usr/share/$(PKGSNAME)/NEWS /usr/share/doc/$(PACKAGE)/NEWS
 	dh_link usr/share/$(PKGSNAME)/NEWS.ja /usr/share/doc/$(PACKAGE)/NEWS.ja
-	find debian/$(PACKAGE) -name CVS -prune -exec rm -rf {} \;
-	find debian/$(PACKAGE) -name .cvsignore -prune -exec rm -rf {} \;
 
 	dh_compress
 	dh_fixperms
diff -Nru wl-2.15.9+0.20190205/debian/upstream/metadata wl-2.15.9+0.20190205/debian/upstream/metadata
--- wl-2.15.9+0.20190205/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/upstream/metadata	2020-08-24 12:24:32.000000000 +0000
@@ -0,0 +1,5 @@
+Bug-Database: https://github.com/wanderlust/wanderlust/issues
+Bug-Submit: https://github.com/wanderlust/wanderlust/issues/new
+Repository: https://github.com/wanderlust/wanderlust.git
+Repository-Browse: https://github.com/wanderlust/wanderlust
+Documentation: http://wanderlust.github.io/wl-docs/
diff -Nru wl-2.15.9+0.20190205/debian/watch wl-2.15.9+0.20190205/debian/watch
--- wl-2.15.9+0.20190205/debian/watch	2015-03-28 13:33:02.000000000 +0000
+++ wl-2.15.9+0.20190205/debian/watch	2020-08-24 14:15:16.000000000 +0000
@@ -1,3 +1,4 @@
-version=3
-opts="uversionmangle=s/_/./g;s/rc/~rc/;s/pre/~pre/" \
-https://github.com/wanderlust/wanderlust/tags .*/wl-(\d.*)\.tar\.gz
+version=4
+opts="filenamemangle=s%(?:.*/)?wl-beta_(\d[\d.+a-z]*)\.orig\.tar\.([a-z]+)%wl-$1.tar.$2%" \
+https://packages.debian.org/source/stable/wl-beta \
+(?:.*/)?wl-beta_(\d[\d.+a-z]*)\.orig\.tar\.[a-z]+ debian uupdate