diff --git a/alexandria.spec b/alexandria.spec
index 8b56c8d..f26fdc7 100644
--- a/alexandria.spec
+++ b/alexandria.spec
@@ -170,6 +170,9 @@ Alexandria is a GNOME application to help you manage your book collection.
 	 -e '/system/s|msgfmt |msgfmt --statistics |' \
 	util/rake/gettextgenerate.rb
 
+# Workaround for directory hierarchy
+ln -sf share data
+
 %build
 rake build --trace
 
@@ -207,8 +210,8 @@ desktop-file-install \
 #
 # See http://www.freedesktop.org/software/appstream/docs/ for more details.
 #
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml <<EOF
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
+cat > $RPM_BUILD_ROOT%{_datadir}/metainfo/%{name}.appdata.xml <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 BugReportURL: https://github.com/mvz/alexandria-book-collection-manager/issues/2
@@ -256,9 +259,9 @@ EOF
 %files -f %{name}.lang
 %doc COPYING
 %doc ChangeLog*
-%doc INSTALL
+%doc INSTALL.md
 %doc README*
-%doc TODO
+%doc TODO.md
 %doc doc/[A-Z]*
 %doc doc/cuecat_support.rdoc
 
@@ -275,7 +278,7 @@ EOF
 %{_datadir}/omf/%{name}/
 %{_datadir}/sounds/%{name}/
 
-%{_datadir}/appdata/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.appdata.xml
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.*