diff --git a/public/entry/subscribe.php b/public/entry/subscribe.php
index d38d7c3..53ce0b7 100644
--- a/public/entry/subscribe.php
+++ b/public/entry/subscribe.php
@@ -35,7 +35,10 @@
 $mail->Host = 'mailout.php.net';
 $mail->Port = 25;
 $mail->setFrom($_POST['email']);
-$mail->addAddress("{$_POST['maillist']}+{$_POST['request']}@lists.php.net");
+preg_match('/^(.*?)(-digest)?$/', $_POST['maillist'], $matches);
+$maillist = $matches[1];
+$digest = count($matches) > 2 ? "-digest" : "";
+$mail->addAddress("{$maillist}+{$_POST['request']}{$digest}@lists.php.net");
 $mail->Subject = "PHP Mailing List Website Subscription";
 $mail->Body = "This was a request generated from the form at {$_POST['referer']} by {$_POST['remoteip']}";
 $mail_sent = $mail->send();