diff --git a/sflphone-client-gnome/src/contacts/addressbook.h b/sflphone-client-gnome/src/contacts/addressbook.h
index 54322c300a47e7d6ade45899333dc0f30f05d5e3..08bfe69ecc7520092ea720cae5f3c0e2d1545ce7 100644
--- a/sflphone-client-gnome/src/contacts/addressbook.h
+++ b/sflphone-client-gnome/src/contacts/addressbook.h
@@ -87,8 +87,8 @@ struct AddrBookHandle {
     gboolean (*is_enabled) (void);
     gboolean (*is_active) (void);
     void (*search) (AddrBookHandle *, GtkEntry *, AddressBook_Config *);
-    book_data_t *(*get_books_data)(gchar **);
-    GSList *(*get_book_data_by_uid)(gchar *);
+    GSList *(*get_books_data)(gchar **);
+    book_data_t *(*get_book_data_by_uid)(gchar *);
     void (*set_current_book)(gchar *); 
     void (*set_search_type)(AddrbookSearchType);
     void (*search_cb)(GList *, gpointer); 
diff --git a/sflphone-plugins/autogen.sh b/sflphone-plugins/autogen.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b161dd6ab7f5ebfc7414add4af0125d227a0b011
--- /dev/null
+++ b/sflphone-plugins/autogen.sh
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+# Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=565663
+[ ! -e m4 ] && mkdir m4
+
+gnome-doc-prepare --force
+autoreconf --force --install --verbose -Wall -I m4
diff --git a/sflphone-plugins/plugin/addressbook/addressbook.h b/sflphone-plugins/plugin/addressbook/addressbook.h
index 54322c300a47e7d6ade45899333dc0f30f05d5e3..08bfe69ecc7520092ea720cae5f3c0e2d1545ce7 100644
--- a/sflphone-plugins/plugin/addressbook/addressbook.h
+++ b/sflphone-plugins/plugin/addressbook/addressbook.h
@@ -87,8 +87,8 @@ struct AddrBookHandle {
     gboolean (*is_enabled) (void);
     gboolean (*is_active) (void);
     void (*search) (AddrBookHandle *, GtkEntry *, AddressBook_Config *);
-    book_data_t *(*get_books_data)(gchar **);
-    GSList *(*get_book_data_by_uid)(gchar *);
+    GSList *(*get_books_data)(gchar **);
+    book_data_t *(*get_book_data_by_uid)(gchar *);
     void (*set_current_book)(gchar *); 
     void (*set_search_type)(AddrbookSearchType);
     void (*search_cb)(GList *, gpointer);