--- a/templatecmd.c	Mon Feb 15 19:24:10 2010 +0200
+++ b/templatecmd.c	Thu Mar 04 19:54:57 2010 +0200
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <glib.h>
-#include <gmodule.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -25,6 +24,17 @@
 #include <mcabber/commands.h>
 #include <mcabber/utils.h>
 #include <mcabber/logprint.h>
+#include <mcabber/modules.h>
+
+static void tcmd_init (void);
+static void tcmd_uninit (void);
+
+module_info_t info_templatecmd = {
+	.mcabber_version = "0.10.0",
+	.requires        = NULL,
+	.init            = tcmd_init,
+	.uninit          = tcmd_uninit,
+};
 
 typedef struct {
 	gchar    *name;
@@ -187,14 +197,12 @@
 }
 
 
-const gchar *g_module_check_init (GModule *module)
+static void tcmd_init (void)
 {
 	cmd_add ("templatecmd", "", COMPL_CMD, COMPL_CMD, do_templatecmd, NULL);
-
-	return NULL;
 }
 
-void g_module_unload (GModule *module)
+static void tcmd_uninit (void)
 {
 	GSList *tel;