Index: configure
--- configure.orig	2014-09-11 02:43:33.000000000 +0200
+++ configure	2014-09-11 17:41:49.041795944 +0200
@@ -6549,9 +6549,6 @@
 
 
 # Check for libmilter and its header files in the usual locations
-if test -d /usr/lib/libmilter ; then
-	LDFLAGS="$LDFLAGS -L/usr/lib/libmilter"
-fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mi_stop in -lmilter" >&5
 $as_echo_n "checking for mi_stop in -lmilter... " >&6; }
 if ${ac_cv_lib_milter_mi_stop+:} false; then :
@@ -6707,9 +6704,9 @@
 
 fi
 
-for ac_header in libmilter/mfapi.h
+for ac_header in milter/mfapi.h
 do :
-  ac_fn_cxx_check_header_mongrel "$LINENO" "libmilter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
+  ac_fn_cxx_check_header_mongrel "$LINENO" "milter/mfapi.h" "ac_cv_header_libmilter_mfapi_h" "$ac_includes_default"
 if test "x$ac_cv_header_libmilter_mfapi_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMILTER_MFAPI_H 1
Index: spamass-milter.cpp
--- spamass-milter.cpp.orig	2014-09-11 02:38:00.000000000 +0200
+++ spamass-milter.cpp	2014-09-11 17:41:49.051481020 +0200
@@ -101,7 +101,7 @@
 extern "C" {
 #endif
 
-#include "libmilter/mfapi.h"
+#include "milter/mfapi.h"
 //#include "libmilter/mfdef.h"
 
 #if !HAVE_DECL_STRSEP