diff --git a/exim-greylist.conf.inc b/exim-greylist.conf.inc
index e70f960..147fe3f 100644
--- a/exim-greylist.conf.inc
+++ b/exim-greylist.conf.inc
@@ -19,10 +19,10 @@ GREYDB=/var/spool/exim/db/greylist.db
 # database table for these 'known resenders' looks like this:
 #
 # CREATE TABLE resenders (
-#        host            TEXT PRIMARY KEY,
+#        host            TEXT,
 #        helo            TEXT,
-#        time            INTEGER
-# );
+#        time            INTEGER,
+#    PRIMARY KEY (host, helo) );
 #
 # To remember mail we've rejected, we create an 'identity' from its sender
 # and recipient addresses and its Message-ID: header. We don't include the
@@ -37,11 +37,10 @@ GREYDB=/var/spool/exim/db/greylist.db
 # looks like this:
 #
 # CREATE TABLE greylist (
-#        id              TEXT PRIMARY KEY,
+#        id              TEXT,
 #        expire          INTEGER,
 #        host            TEXT,
-#        helo            TEXT
-# );
+#        helo            TEXT);
 #
 
 greylist_mail:
diff --git a/mk-greylist-db.sql b/mk-greylist-db.sql
index 97b45df..29550e8 100644
--- a/mk-greylist-db.sql
+++ b/mk-greylist-db.sql
@@ -1,7 +1,8 @@
 CREATE TABLE resenders (
-	host		TEXT PRIMARY KEY,
+	host		TEXT,
 	helo		TEXT,
 	time		INTEGER
+    PRIMARY KEY (host, helo)
 );
 
 CREATE TABLE greylist (