diff --git a/.cvsignore b/.cvsignore
index b905235..5b77792 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Perl-Tidy-20031021.tar.gz
+Perl-Tidy-20060614.tar.gz
diff --git a/perltidy.spec b/perltidy.spec
index f06b496..0e98989 100644
--- a/perltidy.spec
+++ b/perltidy.spec
@@ -1,19 +1,16 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perltidy
-Version:        20031021
-Release:        2
-
+Version:        20060614
+Release:        1%{?dist}
 Summary:        Tool for indenting and reformatting Perl scripts
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://perltidy.sourceforge.net/
-Source:         http://download.sf.net/perltidy/Perl-Tidy-20031021.tar.gz
+Source:         http://download.sf.net/perltidy/Perl-Tidy-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -30,7 +27,8 @@ brackets because it is very good at localizing errors.
 
 
 %prep
-%setup -q -n Perl-Tidy-20031021
+%setup -q -n Perl-Tidy-%{version}
+rm -f docs/perltidy.1 examples/pt.bat
 
 
 %build
@@ -44,10 +42,9 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
-rm -f docs/perltidy.1 # already in mandir
 
 
-%check || :
+%check
 make test
 
 
@@ -57,14 +54,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc BUGS CHANGES COPYING README TODO docs
+%doc BUGS CHANGES COPYING README TODO docs/ examples/
 %{_bindir}/perltidy
-%{perl_vendorlib}/Perl
+%{perl_vendorlib}/Perl/
 %{_mandir}/man1/perltidy.1*
 %{_mandir}/man3/Perl::Tidy.3*
 
 
 %changelog
+* Thu Jun 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060614-1
+- 20060614, specfile cleanups, include examples in docs.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
diff --git a/sources b/sources
index e46adcb..ed196b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba1e8aff6329666564a3c72a202d1a7f  Perl-Tidy-20031021.tar.gz
+4f147bdec6140216db983a72c01bbfd7  Perl-Tidy-20060614.tar.gz