--- a/Makefile.am	2023-01-23 22:21:20.376505977 +0100
+++ b/Makefile.am	2023-01-23 22:22:18.655565802 +0100
@@ -10,9 +10,9 @@
 
 HTML2TXT=elinks -dump -no-numbering -no-references
 
-SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 @DBSUBDIR@ libs/makedat libs/maildir libs/maildrop
+SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 @DBSUBDIR@ libs/maildir libs/maildrop
 
-DIST_SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop
+DIST_SUBDIRS=libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/maildir libs/maildrop
 
 HTMLWWW=index.html documentation.html download.html links.html
 EXTRA_DIST=README.html INSTALL.html UPGRADE.html README.postfix\
@@ -31,7 +31,7 @@
 DELIVERQUOTAHTMLSOURCE=maildirquota.html deliverquota.html
 
 DELIVERQUOTAHTML=$(DELIVERQUOTAHTMLSOURCE)
-DELIVERQUOTAMAN=maildirquota.7 deliverquota.8
+DELIVERQUOTAMAN=maildirquota.7
 
 #  Install deliverquota into libdir/bin
 #
@@ -51,7 +51,7 @@
 uninstall-deliverquota:
 	rm -f $(DESTDIR)$(bindir)/deliverquota
 
-MAILDROPHTML=lockmail.html maildiracl.html maildirkw.html \
+MAILDROPHTML=lockmail.html maildiracl.html \
 	maildirwatch.html \
 	maildirmake.html maildropex.html \
 	maildir.html \
@@ -59,11 +59,10 @@
 	makemime.html reformail.html reformime.html
 
 if HAVE_DBLIBRARY
-MAILDROPHTML += makedat.html
 endif
 
 MAILDROPMAN=lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.7 \
-	maildirkw.1 maildirwatch.1 \
+	maildirwatch.1 \
 	maildir.5 \
 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
 
@@ -68,7 +67,6 @@
 	maildropfilter.7 maildropgdbm.7 makemime.1 reformail.1 reformime.1
 
 if HAVE_DBLIBRARY
-MAILDROPMAN += makedat.1
 endif
 
 EXTRA_LTLIBRARIES=librfc822.la librfc2045.la
@@ -88,14 +86,12 @@
 html_DATA=$(htmldataclean) manpage.css
 
 if !HAVE_DBLIBRARY
-html_DATA += makedat.html
 endif
 
 man_MANS=$(DELIVERQUOTAMAN) \
 	$(MAILDROPMAN) $(DEVEL_MAN)
 
 if !HAVE_DBLIBRARY
-man_MANS += makedat.1
 endif
 
 DISTCLEANFILES=$(htmldataclean) $(man_MANS)
@@ -104,7 +104,7 @@
 librfc822_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
 librfc2045_la_LDFLAGS=-rpath $(libdir) -version-info @LIBVERSION_INFO@
 
-install-data-local: install-man install-deliverquota install-maildrop
+install-data-local: install-man install-maildrop
 
 uninstall-local: uninstall-deliverquota uninstall-maildrop
 
@@ -131,14 +131,9 @@
 	done
 	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
 	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildirmake
-	$(INSTALL_PROGRAM) libs/maildir/maildirkw $(DESTDIR)$(bindir)/maildirkw
 	$(INSTALL_PROGRAM) libs/maildir/maildirwatch $(DESTDIR)$(bindir)/maildirwatch
 	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
 	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
 	. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
 	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
 
--- a/configure.ac	2023-01-23 22:19:39.236136459 +0100
+++ b/configure.ac	2023-01-23 22:22:33.810321247 +0100
@@ -203,7 +203,7 @@
 
 AC_SUBST(REPOSITORY)
 
-AC_CONFIG_SUBDIRS(libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/makedat libs/maildir libs/maildrop)
+AC_CONFIG_SUBDIRS(libs/numlib libs/liblock libs/rfc822 libs/rfc2045 libs/gdbmobj libs/bdbobj libs/maildir libs/maildrop)
 
 AC_CONFIG_FILES([Makefile
 	courier-debuild