diff --git a/dia.changes b/dia.changes
index 67bf49c..5263470 100644
--- a/dia.changes
+++ b/dia.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon May 25 02:18:10 CEST 2009 - vuntz@novell.com
+
+- Keep samples subdirectory for the documentation.
+
 -------------------------------------------------------------------
 Wed May  6 00:42:20 CEST 2009 - vuntz@novell.com
 
diff --git a/dia.spec b/dia.spec
index e931548..358090a 100644
--- a/dia.spec
+++ b/dia.spec
@@ -44,7 +44,7 @@ Requires:       python-gtk
 Requires:       xdg-utils
 Summary:        A Diagram Creation Program
 Version:        0.97
-Release:        1
+Release:        2
 Source:         ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
 Source1:        font-test-japanese.dia
 Source2:        font-test-czech.dia
@@ -122,6 +122,7 @@ mv %{buildroot}%{_datadir}/gnome/help/dia/en %{buildroot}%{_datadir}/gnome/help/
 %find_lang %{name}
 # No need for mime-info-to-mime, application/x-dia-diagram is defined in freedesktop.org.xml
 rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info
+rm samples/Makefile* samples/*png
 %fdupes -s $RPM_BUILD_ROOT
 
 %clean
@@ -129,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/*.dia font-test*dia
+%doc AUTHORS COPYING ChangeLog INSTALL KNOWN_BUGS NEWS README TODO samples/ font-test*dia
 %{_bindir}/*
 %{_libdir}/dia
 %{_datadir}/applications/*.desktop
@@ -142,6 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Mon May 25 2009 vuntz@novell.com
+- Keep samples subdirectory for the documentation.
 * Wed May 06 2009 vuntz@novell.com
 - Update to version 0.97:
   + Many build fixes.