diff --git a/defaultcfg/config/FSFWConfig.h b/defaultcfg/config/FSFWConfig.h
index b6255a2f..ea724a64 100644
--- a/defaultcfg/config/FSFWConfig.h
+++ b/defaultcfg/config/FSFWConfig.h
@@ -2,6 +2,7 @@
 #define CONFIG_FSFWCONFIG_H_
 
 #include <FSFWVersion.h>
+#include <cstddef>
 
 //! Used to determine whether C++ ostreams are used
 //! Those can lead to code bloat.
@@ -11,8 +12,8 @@
 //! Be careful, this also turns off most diagnostic prinouts!
 #define FSFW_REDUCED_PRINTOUT		0
 
-//! Default timestamp size. The default timestamp will be a seven byte CDC short
-//! timestamp.
+//! Default timestamp size. The default timestamp will be an eight byte CDC
+//! short timestamp.
 #define FSFW_MISSION_TIMESTAMP_SIZE 8
 
 //! Can be used to enable debugging printouts for developing the FSFW
@@ -43,5 +44,11 @@
 //! will not be provided. This define should be set to 1 if this is the case.
 #define FSFW_NO_C99_IO 	1
 
+namespace fsfwconfig {
+//! Configure the allocated pool sizes for the event manager.
+static constexpr size_t FSFW_EVENTMGMR_MATCHTREE_NODES = 240;
+static constexpr size_t FSFW_EVENTMGMT_EVENTIDMATCHERS = 120;
+static constexpr size_t FSFW_EVENTMGMR_RANGEMATCHERS   = 120;
+}
 
 #endif /* CONFIG_FSFWCONFIG_H_ */