diff --git a/CHANGES b/CHANGES
index 1ba54048..6722ac34 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+XX xxx XXXX - 2.9.0
+-------------------
+
+ * Fix apr_crypto.h include, now checking if apr_crypto.h is available by
+   checking the definition WITH_APU_CRYPTO.
+   [martinjina and ModSecurity team]
+
 15 Dez 2014 - 2.9.0-RC2
 -----------------------
 
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index fc5be7de..bbec3faa 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -52,7 +52,6 @@ typedef struct msc_parm msc_parm;
 #include "apr_md5.h"
 #include "apr_strings.h"
 #include "apr_hash.h"
-#include "apr_crypto.h"
 #include "httpd.h"
 #include "http_config.h"
 #include "http_log.h"
diff --git a/apache2/msc_remote_rules.c b/apache2/msc_remote_rules.c
index 798c9f72..9f4baa42 100644
--- a/apache2/msc_remote_rules.c
+++ b/apache2/msc_remote_rules.c
@@ -24,7 +24,9 @@
 #include <apu.h>
 
 #ifdef WITH_REMOTE_RULES
+#ifdef WITH_APU_CRYPTO
 #include <apr_crypto.h>
+#endif
 #include <apr_sha1.h>
 #endif