diff --git a/plugins/check_relay b/plugins/check_relay
index 6474ea3..e5136d9 100644
--- a/plugins/check_relay
+++ b/plugins/check_relay
@@ -12,7 +12,16 @@ sub register {
 sub check_relay {
   my ($self, $transaction, $recipient) = @_;
   my $host = lc $recipient->host;
-  my @rcpt_hosts = $self->qp->config("rcpthosts");
+
+  my @rcpt_hosts = ($self->qp->config("me"), $self->qp->config("rcpthosts"));
+  
+  # Allow 'no @' addresses for 'postmaster' and 'abuse'
+  # qmail-smtpd will do this for all users without a domain, but we'll
+  # be a bit more picky.  Maybe that's a bad idea.
+  my $user = $recipient->user;
+  $host = $self->qp->config("me")
+    if ($host eq "" && (lc $user eq "postmaster" || lc $user eq "abuse"));
+
   return (OK) if exists $ENV{RELAYCLIENT};
   for my $allowed (@rcpt_hosts) {
     $allowed =~ s/^\s*(\S+)/$1/;