diff --git a/.gitignore b/.gitignore
index a4cd19c4a..4126c2677 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,4 @@ TuxPaint.dmg
 *.thumbs
 src/po/POTFILES.in
 src/tuxpaint.desktop
-src/org.tuxpaint.Tuxpaint.metainfo.xml
+src/org.tuxpaint.Tuxpaint.appdata.xml
diff --git a/Makefile b/Makefile
index 3500e79f5..4f8de619f 100644
--- a/Makefile
+++ b/Makefile
@@ -535,7 +535,7 @@ $(MOFILES): trans/%.mo: src/po/%.po
 %.desktop: %.desktop.in $(POTFILES)
 	msgfmt --desktop -d src/po --template $< -o $@
 
-%.metainfo.xml: %.metainfo.xml.in $(POTFILES)
+%.appdata.xml: %.appdata.xml.in $(POTFILES)
 	msgfmt --xml -d src/po --template $< -o $@
 
 .PHONY: translations
@@ -547,7 +547,7 @@ translations: trans
 	@echo "Install gettext to run Tux Paint in non-U.S. English modes."
 	@echo "--------------------------------------------------------------"
 else
-translations: trans $(MOFILES) src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
+translations: trans $(MOFILES) src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
 endif
 
 trans:
@@ -722,7 +722,7 @@ clean:
 # are the same as they were when you installed, of course!!!
 .PHONY: uninstall
 uninstall:	uninstall-i18n
-	-rm $(METAINFO_PREFIX)/org.tuxpaint.Tuxpaint.metainfo.xml
+	-rm $(METAINFO_PREFIX)/org.tuxpaint.Tuxpaint.appdata.xml
 	-rm /usr/share/applications/tuxpaint.desktop
 	-rm /usr/share/pixmaps/tuxpaint.png
 	-rm $(ICON_PREFIX)/tuxpaint.png
@@ -939,7 +939,7 @@ install-nokia770:
 # FIXME: No way to install SVG icons using `xdg-icon-resource`
 # (see https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/790449)
 .PHONY: install-xdg
-install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
+install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
 	@echo
 	@echo "...Installing launcher icon into desktop environment..."
 	@if [ "x$(shell which xdg-icon-resource install)" != "x" ]; then \
@@ -960,7 +960,7 @@ install-xdg: src/tuxpaint.desktop src/org.tuxpaint.Tuxpaint.metainfo.xml
 	@if [ "x$(shell which update-desktop-database)" != "x" ]; then \
 	  update-desktop-database ; \
 	fi
-	install --mode=0644 -Dt $(METAINFO_PREFIX) src/org.tuxpaint.Tuxpaint.metainfo.xml
+	install --mode=0644 -Dt $(METAINFO_PREFIX) src/org.tuxpaint.Tuxpaint.appdata.xml
 
 # Install the PNG icon (for KDE desktop, etc.)
 # and the 24-color 32x32 XPM (for other Window managers):
diff --git a/src/org.tuxpaint.Tuxpaint.metainfo.xml.in b/src/org.tuxpaint.Tuxpaint.appdata.xml.in
similarity index 100%
rename from src/org.tuxpaint.Tuxpaint.metainfo.xml.in
rename to src/org.tuxpaint.Tuxpaint.appdata.xml.in
diff --git a/src/po/POTFILES.in.in b/src/po/POTFILES.in.in
index 1f2b83cff..9fa657d15 100644
--- a/src/po/POTFILES.in.in
+++ b/src/po/POTFILES.in.in
@@ -6,7 +6,7 @@ great.h
 im.c
 macos.h
 macos.m
-org.tuxpaint.Tuxpaint.metainfo.xml.in
+org.tuxpaint.Tuxpaint.appdata.xml.in
 shapes.h
 titles.h
 tools.h