diff -Nur cyrus-sasl-2.1.17.orig/include/Makefile.in cyrus-sasl-2.1.17/include/Makefile.in
--- cyrus-sasl-2.1.17.orig/include/Makefile.in	2003-12-01 17:35:06.000000000 +0100
+++ cyrus-sasl-2.1.17/include/Makefile.in	2004-01-13 22:03:41.000000000 +0100
@@ -226,7 +226,7 @@
 
 noinst_HEADERS = gai.h exits.h
 
-saslincludedir = $(includedir)/sasl
+saslincludedir = $(includedir)
 saslinclude_HEADERS = hmac-md5.h md5.h md5global.h sasl.h saslplug.h saslutil.h prop.h
 
 noinst_PROGRAMS = makemd5
diff -Nur cyrus-sasl-2.1.17.orig/utils/Makefile.in cyrus-sasl-2.1.17/utils/Makefile.in
--- cyrus-sasl-2.1.17.orig/utils/Makefile.in	2003-12-01 17:35:08.000000000 +0100
+++ cyrus-sasl-2.1.17/utils/Makefile.in	2004-01-13 22:05:19.000000000 +0100
@@ -253,7 +253,7 @@
 smtptest_DEPENDENCIES = ./smtptest.lo ./libsfsasl2.la
 smtptest_LDADD = ./smtptest.lo ./libsfsasl2.la @SFIO_LIB_FLAGS@ @DMALLOC_LIBS@ $(all_sasl_libs)
 
-saslincludedir = $(includedir)/sasl
+saslincludedir = $(includedir)
 
 saslinclude_HEADERS = @SASL_UTIL_HEADERS_EXTRA@
 EXTRA_HEADERS = sfsasl.h