Index: dv-opendkim-2.5.0.beta8/opendkim/opendkim-spam.c
===================================================================
--- dv-opendkim-2.5.0.beta8.orig/opendkim/opendkim-spam.c	2011-12-15 21:54:21.000000000 +0100
+++ dv-opendkim-2.5.0.beta8/opendkim/opendkim-spam.c	2011-12-18 12:16:37.000000000 +0100
@@ -32,7 +32,7 @@
 
 /* definitions, macros, etc. */
 #define	BUFRSZ		1024
-#define	CMDLINEOPTS	"b:c:d:fh:o:p:P:s:u:vV"
+#define	CMDLINEOPTS	"b:c:d:fh:N:o:p:P:s:u:vV"
 #define	DEFDBBACKEND	SQL_BACKEND
 #define	DEFCONFFILE	CONFIG_BASE "/opendkim-spam.conf"
 #define	DEFDBHOST	"localhost"
@@ -174,6 +174,12 @@
 			dbhost = optarg;
 			break;
 
+		  case 'N':
+			/* accept and ignore any -N switch
+			 * added by the quarantine feature of amavisd-new
+			 */
+			break;
+
 		  case 'P':
 			dbport = optarg;
 			break;
