diff -urN courier-pythonfilter/Makefile courier-pythonfilter-new/Makefile
--- courier-pythonfilter/Makefile	2009-05-06 20:13:31.000000000 +0200
+++ courier-pythonfilter-new/Makefile	2009-05-13 23:22:48.000000000 +0200
@@ -28,6 +28,7 @@
 
 OPTIONS=	DEBUG		"debug module"					on \
 		NODUPLICATES	"noduplicates module"				off \
+		LOCALSENDERS	"localsenders module"				off \
 		CLAMAV_CLAMD	"clamav filter with py-pyclamd \ mutually"	off \
 		CLAMAV_LIB	"clamav filter with py-clamav  / exclusive"	off \
 		SPAMASSASSIN	"spamassassin module"				off \
@@ -41,7 +42,6 @@
 		PRIVATEADDR	"privateaddr module"				off \
 		SPFCHECK	"spfcheck module"				off \
 		NOSUCCESSDSN	"nosuccessdsn module"				off \
-		LOCALSENDERS	"localsenders module"				off \
 		COMEAGAIN	"comeagain module"				off \
 		GREYLIST	"greylist module"				off \
 		DIALBACK	"dialback module"				off \
@@ -78,6 +78,9 @@
 .if defined(WITH_NODUPLICATES)
 	@${ECHO_MSG} noduplicate >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
+.if defined(WITH_LOCALSENDERS)
+	@${ECHO_MSG} localsenders >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
 .if defined(WITH_CLAMAV_CLAMD) || defined(WITH_CLAMAV_LIB)
 	@${ECHO_MSG} clamav >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
@@ -114,9 +117,6 @@
 .if defined(WITH_NOSUCCESSDSN)
 	@${ECHO_MSG} nosuccessdsn >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
-.if defined(WITH_LOCALSENDERS)
-	@${ECHO_MSG} localsenders >> ${WRKSRC}/pythonfilter.conf.sample
-.endif
 .if defined(WITH_COMEAGAIN)
 	@${ECHO_MSG} comeagain >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
@@ -132,6 +132,9 @@
 .if defined(WITH_ATTACHMENTS)
 	@${ECHO_MSG} attachments >> ${WRKSRC}/pythonfilter.conf.sample
 .endif
+.if defined(WITH_QUOTA)
+	@${ECHO_MSG} quota >> ${WRKSRC}/pythonfilter.conf.sample
+.endif
 
 post-install:
 	${MKDIR} ${LOCALSTATEDIR}/pythonfilter
diff -urN courier-pythonfilter/files/patch-setup.py courier-pythonfilter-new/files/patch-setup.py
--- courier-pythonfilter/files/patch-setup.py	2009-05-06 20:13:31.000000000 +0200
+++ courier-pythonfilter-new/files/patch-setup.py	2009-07-22 08:23:37.000000000 +0200
@@ -6,6 +6,6 @@
        package_dir={'pythonfilter': 'filters'},
 -      data_files=[('/etc/', ['pythonfilter.conf',
 -                             'pythonfilter-modules.conf'])]
-+      data_files=[('/usr/local/etc/', ['pythonfilter.conf.sample',
-+                                       'pythonfilter-modules.conf.sample'])]
++      data_files=[(os.environ['PREFIX'] + '/etc/', ['pythonfilter.conf.sample',
++                                                    'pythonfilter-modules.conf.sample'])]
       )