--- a/Makefile.am	2023-01-23 22:58:11.644686431 +0100
+++ b/Makefile.am	2023-01-23 22:58:34.812309175 +0100
@@ -13,7 +13,7 @@
 SUBDIRS=libs/numlib libs/bdbobj libs/gdbmobj libs/soxwrap \
 	libs/rfc822 libs/rfc2045 \
 	libs/md5 libs/sha1 libs/random128 libs/rfc1035 libs/liblock \
-	libs/maildir libs/makedat libs/libhmac \
+	libs/maildir libs/libhmac \
 	libs/waitlib libs/tcpd libs/rootcerts libs/imap
 
 sbin_SCRIPTS=sharedindexinstall sharedindexsplit
@@ -21,10 +21,10 @@
 databindir=$(datadir)
 databin_SCRIPTS=mkimapdcert mkpop3dcert mkdhparams
 
-binPROGRAMS=imapd pop3d maildirmake maildiracl deliverquota maildirkw \
-	makeimapaccess makedat
+binPROGRAMS=imapd pop3d maildirmake maildiracl \
+	makeimapaccess
 sbinPROGRAMS=imaplogin pop3login
-libexecPROGRAMS=makedatprog couriertcpd
+libexecPROGRAMS=couriertcpd
 
 bin_PROGRAMS= @binPROGRAMS_exec@
 sbin_PROGRAMS=@sbinPROGRAMS_exec@
@@ -32,7 +32,7 @@
 
 EXTRA_PROGRAMS=
 
-man_MANS=couriertcpd.1 deliverquota.8 maildirmake.1 maildiracl.1 imapd.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 maildirkw.1 makeimapaccess.8
+man_MANS=couriertcpd.1 maildirmake.1 maildiracl.1 imapd.8 mkdhparams.8 mkimapdcert.8 mkpop3dcert.8 makeimapaccess.8
 EXTRA_DIST=README README.cygwin\
 	COPYING.GPL NEWS.html $(TEMPLFILES) pgpkeys.txt
 
--- a/configure.ac	2023-01-23 22:59:15.960638991 +0100
+++ b/configure.ac	2023-01-23 22:59:29.744414452 +0100
@@ -213,7 +213,7 @@
 AC_CONFIG_SUBDIRS(libs/numlib libs/bdbobj libs/gdbmobj libs/soxwrap
 	libs/rfc822 libs/rfc1035 libs/rfc2045
 	libs/md5 libs/sha1 libs/random128 libs/liblock
-	libs/maildir libs/makedat libs/libhmac
+	libs/maildir libs/libhmac
 	libs/waitlib libs/tcpd libs/rootcerts libs/imap)
 
 # Courier-IMAP standalone does not use SOCKSv5
--- a/libs/maildir/Makefile.am	2023-05-19 08:27:01.231067057 +0200
+++ b/libs/maildir/Makefile.am	2023-05-19 08:28:20.739827947 +0200
@@ -13,8 +13,7 @@
 	maildir.html maildir.5 \
 	maildiracl.html.in \
 	maildirmake.html.in maildirmake.1.in maildirquota.html maildirquota.7 \
-	maildirwatch.html maildirwatch.1 \
-	maildirkw.html maildirkw.1
+	maildirwatch.html maildirwatch.1
 
 BUILT_SOURCES=maildirsharedrc.h maildirfilterconfig.h quotawarnmsg.h \
 	mailbot.h autoresponsequota.h $(noinst_DATA) libmaildir.deps