diff -r 29b273d63835 -r a01e65d97743 jabberd/jabberd.patch
--- a/jabberd/jabberd.patch	Sat Oct 31 19:00:00 2009 +0100
+++ b/jabberd/jabberd.patch	Sat Oct 31 19:03:03 2009 +0100
@@ -32,15 +32,6 @@
  
      <!-- Port to bind to, or 0 to disable unencrypted access to the
           server (default: 5222) -->
-@@ -331,7 +329,7 @@
-     <path>@pkglibdir@</path>
- 
-     <!-- Backend module to use -->
--    <module>sqlite</module>
-+    <module>db</module>
- 
-     <!-- Available authentication mechanisms -->
-     <mechanisms>
 Index: etc/router.xml.dist.in
 --- etc/router.xml.dist.in.orig	2009-06-30 11:38:16 +0200
 +++ etc/router.xml.dist.in	2009-06-30 20:45:06 +0200
@@ -126,15 +117,6 @@
  
      <!-- If logging to file, this is the filename of the logfile -->
      <!--
-@@ -85,7 +85,7 @@
-     <path>@pkglibdir@</path>
- 
-     <!-- By default, we use the SQLite driver for all storage -->
--    <driver>sqlite</driver>
-+    <driver>db</driver>
- 
-     <!-- Its also possible to explicitly list alternate drivers for
-          specific data types. -->
 Index: sm/mod_iq_time.c
 --- sm/mod_iq_time.c.orig	2009-06-30 11:38:15 +0200
 +++ sm/mod_iq_time.c	2009-06-30 20:45:06 +0200
@@ -181,3 +163,33 @@
  
  #include <expat.h>
  
+Index: tools/jabberd.in
+--- tools/jabberd.in.orig	2009-10-31 17:51:42.857115000 +0100
++++ tools/jabberd.in	2009-10-31 18:07:52.095812899 +0100
+@@ -63,7 +63,7 @@
+ 
+ 
+ #-----------------------------------------------------------------------------
+-# Setup the jobs: router, sm, c2s, s2s
++# Setup the jobs: router, sm, c2s, s2s, mu-conference
+ #-----------------------------------------------------------------------------
+ $jobs{jabberd}->{prefix}  = "JBRD";
+ 
+@@ -83,12 +83,17 @@
+ $jobs{s2s}->{config} = "$config_dir/s2s.xml";
+ $jobs{s2s}->{prefix} = "S2S";
+ 
++$jobs{muc}->{cmd} = "$Bin/mu-conference";
++$jobs{muc}->{config} = "$config_dir/muc.xml";
++$jobs{muc}->{prefix} = "MUC";
++
+ if ($config eq "internal")
+ {
+     $programs[0] = ["router"];
+     $programs[1] = ["sm"];
+     $programs[2] = ["c2s"];
+     $programs[3] = ["s2s"];
++    $programs[4] = ["muc"];
+ }
+ else
+ {