diff --git a/CHANGES b/CHANGES
index 64df54ff0..9a6cb1d4b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ TRUNK
 -   MUC: support for XEP-0421 occupant identifiers
 -   mod_http_file_share: File sharing via HTTP (XEP-0363)
 -   statistics scheduling can be done by plugin
+-   mod_server_contact_info now loaded on components if enabled
 
 0.11.0
 ======
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index 9d2a74c7b..9256ae4f3 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -42,6 +42,7 @@ local component_inheritable_modules = {
 	"iq",
 	"s2s",
 	"s2s_bidi",
+	"server_contact_info",
 };
 
 -- We need this to let modules access the real global namespace
diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index c5ed279bd..6d3980ed4 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -127,7 +127,6 @@ Component "conference.localhost" "muc"
 	admins = { "Admin@localhost" }
 	modules_enabled = {
 		"muc_mam";
-		"server_contact_info";
 	}