diff --git a/.cvsignore b/.cvsignore
index edb696a..63a5ba5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-poppler-0.5.3.tar.gz
+poppler-0.5.4.tar.gz
+poppler-data-0.1.tar.gz
diff --git a/poppler.spec b/poppler.spec
index 39dcac0..383ef94 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,11 +1,14 @@
+%define dataversion 0.1
+
 Summary: PDF rendering library
 Name: poppler
-Version: 0.5.3
-Release: 3%{?dist}
+Version: 0.5.4
+Release: 1%{?dist}
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
-Patch0: poppler-0.5.3-libs.patch
+Source1: %{name}-data-%{dataversion}.tar.gz
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
 BuildRequires: cairo-devel
@@ -43,25 +46,31 @@ This utils package installs a number of command line tools for
 converting PDF files to a number of other formats.
 
 %prep
-%setup -q
-%patch0 -p1 -b .libs
+%setup -c -q -a1
 
 %build
+cd %{name}-%{version}
 %configure --enable-cairo-output --disable-splash-output
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%makeinstall -C %{name}-%{version}
+make -C %{name}-data-%{dataversion} \
+	DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install
+
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog README
+%doc %{name}-%{version}/ChangeLog
+%doc %{name}-%{version}/README
 %{_libdir}/lib*.so.*
+%{_datadir}/poppler
 
 %files devel
 %defattr(-, root, root)
@@ -77,6 +86,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Thu Sep 21 2006 Kristian Høgsberg <krh@redhat.com> - 0.5.4-1.fc6
+- Rebase to 0.5.4, drop poppler-0.5.3-libs.patch, fixes #205813,
+  #205549, #200613, #172137, #172138, #161293 and more.
+
 * Wed Sep 13 2006 Kristian Høgsberg <krh@redhat.com> - 0.5.3-3.fc6
 - Move .so to -devel (#203637).
 
diff --git a/sources b/sources
index c46024b..3f21bbb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d06207536555f5711e7bc61711c1b8a0  poppler-0.5.3.tar.gz
+053fdfd70533ecce1a06353fa945f061  poppler-0.5.4.tar.gz
+5c700eb06dda9dafec09cd85225e34d4  poppler-data-0.1.tar.gz