diff --git a/doc/Changelog b/doc/Changelog
index a6a4ceb35..50146508b 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+20 January 2017: Wouter
+	- Increase MAX_MODULE to 16.
+
 19 January 2017: Wouter
 	- Fix to Rename ub_callback_t to ub_callback_type, because POSIX
 	  reserves _t typedefs.
diff --git a/util/module.h b/util/module.h
index 1c38ae940..d3db3eaec 100644
--- a/util/module.h
+++ b/util/module.h
@@ -176,7 +176,7 @@ struct iter_forwards;
 struct iter_hints;
 
 /** Maximum number of modules in operation */
-#define MAX_MODULE 5
+#define MAX_MODULE 16
 
 /** Maximum number of known edns options */
 #define MAX_KNOWN_EDNS_OPTS 256