diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index dc7985beba..bd6be11904 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -3,12 +3,16 @@
 desktop_in_files = gimp.desktop.in.in
 desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
 
+appdata_in_files = gimp.appdata.xml.in
+appdata_files = $(appdata_in_files:.appdata.xml.in=.appdata.xml)
 
 if DESKTOP_DATADIR
 
 applicationsdir = $(DESKTOP_DATADIR)/applications
 applications_DATA = $(desktop_files)
 
+appdatadir = $(DESKTOP_DATADIR)/appdata
+appdata_DATA = $(appdata_files)
 
 icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
 icons16_DATA = 16x16/gimp.png
@@ -35,11 +39,8 @@ install-data-hook:
 
 endif
 
-appdatadir = $(datadir)/appdata
-appdata_files = gimp.appdata.xml
-
 EXTRA_DIST = \
-	$(appdata_files)	\
+	$(appdata_in_files)	\
 	gimp.desktop.in.in	\
 	16x16/gimp.png		\
 	22x22/gimp.png		\
@@ -50,8 +51,9 @@ EXTRA_DIST = \
 	256x256/gimp.png	
 
 
-DISTCLEANFILES = $(desktop_files)
+DISTCLEANFILES = $(desktop_files) $(appdata_files)
 
+@INTLTOOL_XML_RULE@
 
 gimp.desktop: gimp.desktop.in $(wildcard $(top_srcdir)/po/*.po)
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@) -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/desktop/gimp.appdata.xml b/desktop/gimp.appdata.xml.in
similarity index 96%
rename from desktop/gimp.appdata.xml
rename to desktop/gimp.appdata.xml.in
index f0246fc36a..78145ddd4e 100644
--- a/desktop/gimp.appdata.xml
+++ b/desktop/gimp.appdata.xml.in
@@ -10,25 +10,25 @@
   -->
   <licence>CC0</licence>
   <description>
-    <p>
+    <_p>
       GIMP is an acronym for GNU Image Manipulation Program. It is a
       freely distributed program for such tasks as photo retouching,
       image composition and image authoring.
-    </p>
-    <p>
+    </_p>
+    <_p>
       It has many capabilities. It can be used as a simple paint
       program, an expert quality photo retouching program, an online
       batch processing system, a mass production image renderer, an
       image format converter, etc.
-    </p>
-    <p>
+    </_p>
+    <_p>
       GIMP is expandable and extensible. It is designed to be
       augmented with plug-ins and extensions to do just about
       anything. The advanced scripting interface allows everything
       from the simplest task to the most complex image manipulation
       procedures to be easily scripted. GIMP is also available for
       Microsoft Windows and OS X.
-    </p>
+    </_p>
   </description>
   <url type="homepage">http://www.gimp.org/</url>
   <screenshots>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index abdf6ceffc..cdac0024b7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
 
 [encoding: UTF-8]
 
+desktop/gimp.appdata.xml.in
 desktop/gimp.desktop.in.in
 
 app/about.h