--- configure.ac	2008-05-09 18:34:08.000000000 +0200
+++ configure.ac.oden	2008-08-11 11:10:17.000000000 +0200
@@ -519,13 +519,9 @@
 	fi
 	if test "${IMAP_TK_DIR}" != "system"; then
 		AC_MSG_CHECKING(for UW IMAP Toolkit c-client library)
-		if test -f "${IMAP_TK_DIR}/c-client/LDFLAGS"; then
-      		imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
-		fi
-		imap_libs="${IMAP_TK_DIR}/c-client/c-client.a"
-	  	imap_include="-I${IMAP_TK_DIR}/c-client"
-      	CPPFLAGS="${CPPFLAGS} ${imap_include}"
-	  	LIBS="${LIBS} ${imap_libs} "`echo ${imap_ldflags}`
+		imap_ldflags="-lpam -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lssl -lcrypto"
+		CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/include/imap"
+		LIBS="${LIBS} ${IMAP_TK_DIR}/lib/libc-client.a "`echo ${imap_ldflags}`
 	  	AC_LINK_IFELSE(
 	    	AC_LANG_PROGRAM(
 				[#include "c-client.h"
@@ -1017,8 +1013,8 @@
 	fi
 	if test "${ac_cv_imap_tk}" = "yes"; then
 		AC_MSG_RESULT(yes)
-		IMAP_TK_LIB="${imap_libs} "`echo ${imap_ldflags}`
-		IMAP_TK_INCLUDE="${imap_include}"
+		IMAP_TK_LIB="${IMAP_TK_DIR}/lib/libc-client.a "`echo ${imap_ldflags}`
+		IMAP_TK_INCLUDE="-I${IMAP_TK_DIR}/include/imap"
 		PBX_IMAP_TK=1
 		AC_DEFINE([HAVE_IMAP_TK], 1, [Define if your system has the UW IMAP Toolkit c-client library.])
 		if test "${ac_cv_imap_tk2006}" = "yes"; then