diff --git a/.gitignore b/.gitignore
index 29f06d3..8bf4d08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ config.sub
 configure
 depcomp
 gtk-doc.make
+gnome-doc-utils.make
 install-sh
 intltool-extract.in
 intltool-merge.in
@@ -45,6 +46,12 @@ ChangeLog
 
 docs/reference/html
 docs/reference/xml
+docs/reference/emerillon-decl-list.txt
+docs/reference/emerillon-decl.txt
+docs/reference/version.xml
+docs/reference/emerillon-overrides.txt
+docs/reference/emerillon-sections.txt
+docs/reference/emerillon.types
 *.stamp
 
 po/.intltool-merge-cache
@@ -54,7 +61,7 @@ po/Makefile.in.in
 *.pot
 *.gmo
 
-data/emerillon.schemas
+data/org.gnome.emerillon.gschema.xml
 data/emerillon.desktop
 data/emerillon.desktop.in
 emerillon/emerillon
diff --git a/Makefile.am b/Makefile.am
index db634a2..35ce170 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,12 +4,10 @@ EXTRA_DIST = 			\
 	autogen.sh		\
 	ChangeLog		\
 	README			\
-	AUTHORS			\
-	gnome-doc-utils.make
+	AUTHORS
 
 DISTCLEANFILES = 		\
-	ChangeLog		\
-	gnome-doc-utils.make
+	ChangeLog
 
 DISTCHECK_CONFIGURE_FLAGS =		\
 	--disable-scrollkeeper		\
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 18dd09d..983172c 100755
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -22,6 +22,7 @@ plugins_in_files = \
 
 # Placemarks plugin
 placemarks_libplacemarks_la_SOURCES = \
+	../cut-paste/totem-plugin.h \
 	placemarks/add-dialog.h  \
 	placemarks/add-dialog.c  \
 	placemarks/manage-dialog.h  \
@@ -41,6 +42,7 @@ plugins_in_files += \
 	copy-link/copy-link.plugin.in
 
 copy_link_libcopy_link_la_SOURCES = \
+	../cut-paste/totem-plugin.h \
 	copy-link/copy-link.c
 
 copy_link_libcopy_link_la_LIBADD = \
@@ -54,6 +56,7 @@ plugins_in_files += \
 	map-position/map-position.plugin.in
 
 map_position_libmap_position_la_SOURCES = \
+	../cut-paste/totem-plugin.h \
 	map-position/map-position.c
 
 map_position_libmap_position_la_LIBADD = \
@@ -68,6 +71,7 @@ plugins_in_files += \
 	search/search.plugin.in
 
 search_libsearch_la_SOURCES = \
+	../cut-paste/totem-plugin.h \
 	search/search.c
 
 search_libsearch_la_LIBADD = \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 420458a..c7c7d37 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,12 +7,12 @@ emerillon/main.c
 emerillon/sidebar.c
 emerillon/window.c
 emerillon/preferences.c
-[type: gettext/ini]plugins/copy-link/copy-link.emerillon-plugin.in
+[type: gettext/ini]plugins/copy-link/copy-link.plugin.in
 plugins/copy-link/copy-link.c
-[type: gettext/ini]plugins/map-position/map-position.emerillon-plugin.in
+[type: gettext/ini]plugins/map-position/map-position.plugin.in
 plugins/placemarks/add-dialog.c
 plugins/placemarks/manage-dialog.c
 plugins/placemarks/placemarks.c
-[type: gettext/ini]plugins/placemarks/placemarks.emerillon-plugin.in
+[type: gettext/ini]plugins/placemarks/placemarks.plugin.in
 plugins/search/search.c
-[type: gettext/ini]plugins/search/search.emerillon-plugin.in
+[type: gettext/ini]plugins/search/search.plugin.in
