diff --git a/Makefile.am b/Makefile.am
diff --git a/configure.ac b/configure.ac
index 15e0c34..a11353f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,12 +16,12 @@ AC_PROG_CPP
 AC_PROG_LIBTOOL
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdlib.h sys/time.h unistd.h])
-#IT_PROG_INTLTOOL([0.35.0])
-#AC_SUBST(ALL_LINGUAS)
-#AM_GLIB_GNU_GETTEXT
-#GETTEXT_PACKAGE=compcomm-plugins-extra
-#AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-#AC_SUBST(GETTEXT_PACKAGE)
+IT_PROG_INTLTOOL([0.35.0])
+AC_SUBST(ALL_LINGUAS)
+AM_GLIB_GNU_GETTEXT
+GETTEXT_PACKAGE=compiz-fusion-plugins-extra
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
+AC_SUBST(GETTEXT_PACKAGE)
 
 if test "x$GCC" = "xyes"; then
   case " $CFLAGS " in
@@ -176,4 +176,5 @@ src/splash/Makefile
 src/trailfocus/Makefile
 src/showdesktop/Makefile
 src/cubereflex/Makefile
+po/Makefile.in
 ])
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 027811d..f9a8d3e 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -1,24 +1,28 @@
-metadir = $(metadatadir)
-meta_DATA =	         \
-	addhelper.xml \
-	bench.xml \
-	crashhandler.xml \
-	extrawm.xml \
-	fadedesktop.xml \
-	firepaint.xml \
-	group.xml \
-	mblur.xml \
-	reflex.xml \
-	splash.xml \
-	trailfocus.xml \
-	showdesktop.xml \
-	cubereflex.xml
-
-EXTRA_DIST = $(meta_DATA)
+xmldir       = $(metadatadir)
+xml_in_files = 	         \
+	addhelper.xml.in \
+	bench.xml.in \
+	crashhandler.xml.in \
+	extrawm.xml.in \
+	fadedesktop.xml.in \
+	firepaint.xml.in \
+	group.xml.in \
+	mblur.xml.in \
+	reflex.xml.in \
+	splash.xml.in \
+	trailfocus.xml.in \
+	showdesktop.xml.in \
+	cubereflex.xml.in
+
+xml_files    = $(xml_in_files:.xml.in=.xml)
+xml_DATA     = $(xml_files)
+
+@INTLTOOL_XML_RULE@
 
 if USE_SCHEMAS
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = $(patsubst %.xml,compiz-%.schemas,$(meta_DATA))
+schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files))
+schema_DATA  = $(schema_files)
 
 %.schemas: $(meta_DATA)
 	xsltproc -o $@ $(xsltdir)/schemas.xslt $(subst compiz-,,$*).xml;
@@ -30,3 +34,13 @@ install-data-local:
        fi
 endif
 endif
+
+EXTRA_DIST =		\
+	$(xml_files)    \
+	$(xml_in_files) \
+	$(schema_files)
+
+DISTCLEANFILES =	\
+	$(xml_files)    \
+	$(schema_files)
+