diff --git a/library/Icinga/Web/Controller.php b/library/Icinga/Web/Controller.php
new file mode 100644
index 000000000..111ee244c
--- /dev/null
+++ b/library/Icinga/Web/Controller.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Icinga\Web;
+
+use Icinga\Web\Controller\ModuleActionController;
+
+/**
+ * This is the controller all modules should inherit from
+ * We will flip code with the ModuleActionController as soon as a couple
+ * of pending feature branches are merged back to the master.
+ */
+class Controller extends ModuleActionController
+{
+}