--- a/CMakeLists.txt	Mon Feb 15 18:40:52 2010 +0200
+++ b/CMakeLists.txt	Thu Mar 04 19:52:21 2010 +0200
@@ -22,10 +22,8 @@
 ## Check for build dependencies
 find_package(PkgConfig REQUIRED) 
 pkg_check_modules(GLIB REQUIRED glib-2.0) 
-pkg_check_modules(GMODULE REQUIRED gmodule-2.0) 
 pkg_check_modules(MCABBER REQUIRED mcabber)
 link_directories(${GLIB_LIBRARY_DIRS}
-				 ${GMODULE_LIBRARY_DIRS}
 				 ${MCABBER_LIBRARY_DIRS})
 
 ## Target definitions
@@ -33,10 +31,8 @@
 
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
-                    ${GMODULE_INCLUDE_DIRS} 
                     ${MCABBER_INCLUDE_DIRS})
 target_link_libraries(marking ${GLIB_LIBRARIES} 
-                      ${GMODULE_LIBRARIES}
 					  ${MCABBER_LIBRARIES})
 include_directories(${marking_SOURCE_DIR} 
                     ${marking_BINARY_DIR})

--- a/marking.c	Mon Feb 15 18:40:52 2010 +0200
+++ b/marking.c	Thu Mar 04 19:52:21 2010 +0200
@@ -21,7 +21,6 @@
  */
 
 #include <glib.h>
-#include <gmodule.h>
 #include <string.h>
 
 #include <mcabber/hbuf.h>
@@ -30,6 +29,17 @@
 #include <mcabber/compl.h>
 #include <mcabber/utils.h>
 #include <mcabber/logprint.h>
+#include <mcabber/modules.h>
+
+static void marking_init   (void);
+static void marking_uninit (void);
+
+module_info_t info_marking = {
+	.mcabber_version = "0.10.0",
+	.requires        = NULL,
+	.init            = marking_init,
+	.uninit          = marking_uninit,
+};
 
 static GSList *marked_jids = NULL;
 
@@ -170,15 +180,13 @@
 	free_arg_lst (args);
 }
 
-gchar *g_module_check_init (GModule *module)
+static void marking_init (void)
 {
 	cmd_add ("mark", "", 0, COMPL_JID, do_mark, NULL);
 	cmd_add ("marked", "", 0, COMPL_CMD, do_marked, NULL);
-
-	return NULL;
 }
 
-void g_module_unload (GModule *module)
+static void marking_uninit (void)
 {
 	cmd_del ("mark");
 	cmd_del ("marked");

--- a/marking.rc	Mon Feb 15 18:40:52 2010 +0200
+++ b/marking.rc	Thu Mar 04 19:52:21 2010 +0200
@@ -2,5 +2,5 @@
 # Insert
 bind 331 = mark toggle
 
-load marking
+module load marking