diff --git a/cf/roken.m4 b/cf/roken.m4
index 2e33ccd50..e2c87efa2 100644
--- a/cf/roken.m4
+++ b/cf/roken.m4
@@ -4,8 +4,9 @@ dnl try to look for an installed roken library with sufficient stuff
 dnl
 dnl set LIB_roken to the what we should link with
 dnl set DIR_roken to if the directory should be built
+dnl set CPPFLAGS_roken to stuff to add to CPPFLAGS
 
-dnl AC_ROKEN(version,directory-to-try,fallback-string)
+dnl AC_ROKEN(version,directory-to-try,roken-dir,fallback-library,fallback-cppflags)
 AC_DEFUN(AC_ROKEN, [
 
 AC_ARG_WITH(roken,
@@ -47,14 +48,17 @@ CPPFLAGS="$save_CPPFLAGS"
 
 if test "$roken_installed" != "yes"; then
   DIR_roken="roken"
-  LIB_roken='$3'
+  LIB_roken='$4'
+  CPPFLAGS_roken='$5'
+  AC_CONFIG_SUBDIRS(lib/roken)
 else
   LIB_roken="$i/lib/libroken.la"
-  CPPFLAGS="-I$i/include ${CPPFLAGS}"
+  CPPFLAGS_roken="-I$i/include"
 fi
 
 LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
 
 AC_SUBST(LIB_roken)dnl
 AC_SUBST(DIR_roken)dnl
+AC_SUBST(CPPFLAGS_roken)dnl
 ])