diff --git a/CHANGELOG b/CHANGELOG
index 33f523086b93cb0eb4ea45c089a0f7af12ed7d30..500f6688b15674355559d2a732c02e25cd8f1284 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,14 @@
 CHANGELOG
 ---------
 
+2021-09-21
+  sympl-mail:
+    * Deal with aliases correctly when no mailboxes directory exists
+
 2021-08-19
   all:
     * Debian Bullseye Release
-  core:
+  sympl-core:
     * Updates to MOTD and banners
 
 2021-08-18
diff --git a/mail/debian/changelog b/mail/debian/changelog
index 8445446c5d0213d98e55c1d70a1e31afc55cb42b..d369fbe90a114a5dc5ab76231a2bbb76f53316f3 100644
--- a/mail/debian/changelog
+++ b/mail/debian/changelog
@@ -1,3 +1,9 @@
+sympl-mail (11.20210921.1) stable; urgency=medium
+
+  * Deal with mail correctly when no mailboxes directory exists, fixes #317
+
+ -- Paul Cammish <sympl@kelduum.net>  Tue, 21 Sep 2021 13:58:00 +0100
+ 
 sympl-mail (11.20210818.1) stable; urgency=medium
 
   * Debian Bullseye Release
diff --git a/mail/exim4/sympl.d/20-routers/22-vhost-forward b/mail/exim4/sympl.d/20-routers/22-vhost-forward
index fa99ccc8c78cf92b7459403dc069f20c39aef2fd..3f323aa66b985686897b5b78b704959a9348cc43 100644
--- a/mail/exim4/sympl.d/20-routers/22-vhost-forward
+++ b/mail/exim4/sympl.d/20-routers/22-vhost-forward
@@ -5,7 +5,7 @@ vhost_forward:
   domains = +vhost_domains
   local_part_suffix = +*
   local_part_suffix_optional
-  local_parts = ${lookup{$local_part}dsearch{VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}}
+  local_parts = ${if exists {VHOST_DIR/$domain/VHOST_MAILBOX_DIR}{${lookup{$local_part}dsearch{VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}}}{}}
   # Make sure the files exists to avoid awkward failures
   condition  = ${if exists{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part/forward}}
   file  = VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR/$local_part_data/forward
diff --git a/mail/exim4/sympl.d/20-routers/24-vhost-mailbox b/mail/exim4/sympl.d/20-routers/24-vhost-mailbox
index 84abb92e59eb7638c6eadf09e4f983fc02f66c81..31460dc7f1efb13c1e81620e3b17f0989ed82715 100644
--- a/mail/exim4/sympl.d/20-routers/24-vhost-mailbox
+++ b/mail/exim4/sympl.d/20-routers/24-vhost-mailbox
@@ -6,7 +6,7 @@ vhost_mailbox:
   local_part_suffix = +*
   local_part_suffix_optional
   # Define local_parts, which fills in local_part_data
-  local_parts = dsearch;VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR
+  local_parts = ${if exists {VHOST_DIR/$domain/VHOST_MAILBOX_DIR}{dsearch;VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR}{}}
   condition  = ${if exists{VHOST_DIR/$domain/VHOST_MAILBOX_DIR/$local_part/}}
   # Set the home directory for any routers/transports.
   router_home_directory    = VHOST_DIR/$domain_data/VHOST_MAILBOX_DIR/$local_part_data