--- a/core/modulemanager.lua	Mon Jan 23 17:19:16 2012 +0000
+++ b/core/modulemanager.lua	Fri Feb 24 15:14:07 2012 +0000
@@ -34,7 +34,7 @@
 
 local array, set = require "util.array", require "util.set";
 
-local autoload_modules = {"presence", "message", "iq", "offline"};
+local autoload_modules = {"presence", "message", "iq", "offline", "c2s", "s2s"};
 local component_inheritable_modules = {"tls", "dialback", "iq"};
 
 -- We need this to let modules access the real global namespace