diff --git a/poppler.spec b/poppler.spec
index 7ae964b..5b0c4a9 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -3,8 +3,10 @@
 Summary: PDF rendering library
 Name: poppler
 Version: 0.5.9
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: GPLv2 and Redistributable, no modification permitted
+# the code is GPLv2
+# the charmap data in /usr/share/poppler is redistributable
 Group: Development/Libraries
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.gz
@@ -80,6 +82,10 @@ converting PDF files to a number of other formats.
 )
 make %{?_smp_mflags} -C %{name}-%{version}
 
+pushd poppler-data-%{dataversion}
+cp COPYING COPYING-poppler-data
+cp README README-poppler-data
+ppopd
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,8 +101,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc %{name}-%{version}/ChangeLog
 %doc %{name}-%{version}/README
+%doc %{name}-%{version}/COPYING
+%doc poppler-data-%{dataversion}/README-poppler-data
+%doc poppler-data-%{dataversion}/COPYING-poppler-data
 %{_libdir}/libpoppler-glib.so.*
 %{_libdir}/libpoppler.so.*
 %{_datadir}/poppler/
@@ -127,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Aug  8 2007 Matthias Clasen <mclasen@redhat.com> - 0.5.9-2
+- Update the license field
+
 * Mon Jun 18 2007 Matthias Clasen <mclasen@redhat.com> - 0.5.9-1
 - Update to 0.5.9