diff --git a/.cvsignore b/.cvsignore
index fc1401a..72a8492 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpmlint-0.68.tar.bz2
+rpmlint-0.69.tar.bz2
diff --git a/rpmlint-fedora-config b/rpmlint-fedora-config
index 9d5d8a2..e8a1c1a 100644
--- a/rpmlint-fedora-config
+++ b/rpmlint-fedora-config
@@ -4,15 +4,13 @@
 
 from Config import *
 
-#setOption("Vendor", "Fedora Extras")
-#setOption("Distribution", "Fedora Extras")
 setOption("ReleaseExtension", '')
 setOption("ValidBuildHost", ".*")
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseEpoch", 0)
-setOption("ValidSrcPerms", (0644, ))
+setOption("ValidSrcPerms", (0664, 0644, ))
 setOption("ValidGroups", (
     "Amusements/Games",
     "Amusements/Graphics",
@@ -83,3 +81,8 @@ addFilter("E: .* no-dependency-on (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
 addFilter("W: .* invalid-distribution .*")
 addFilter("W: .* invalid-vendor .*")
+addFilter("E: .* incoherent-version-in-name.*")
+addFilter("E: .* invalid-build-requires .*")
+addFilter("E: .* no-packager-tag")
+addFilter("W: .* ghost-files-without-postin")
+addFilter("W: .* postin-without-ghost-file-creation .*")
diff --git a/rpmlint.spec b/rpmlint.spec
index 02fdb10..ab849f2 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,13 +1,13 @@
 Name:           rpmlint
-Version:        0.68
+Version:        0.69
 Release:        1
 Epoch:          0
-Summary:        RPM correctness checker
+Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.68.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,6 +24,9 @@ and source packages can be checked.
 %setup -q
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
+for f in AUTHORS ChangeLog ; do
+  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
 
 
 %build
@@ -33,10 +36,8 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_datadir}/rpmlint/compile.pyo
-install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
+install -Dpm 644 rpmlint.bash-completion \
+  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 
 # Take care of files that may be generated later.
@@ -60,28 +61,29 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 
-%triggerin -- bash-completion
-if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then
-  ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \
-    %{_sysconfdir}/bash_completion.d/rpmlint
-fi
-
-%triggerun -- bash-completion
-[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint
-
-
 %files -f %{name}-%{version}-files.list
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
-%{_datadir}/rpmlint/rpmlint.bash-completion
+%exclude %{_datadir}/rpmlint/check-install.py*
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
-%ghost %{_sysconfdir}/bash_completion.d/rpmlint
+# Not config (yet?) to achieve clean upgrade from pre-0.69.
+%{_sysconfdir}/bash_completion.d
 
 
 %changelog
+* Sat Apr 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.69-1
+- 0.69.
+- Simplify bash-completion snippet installation, remove triggers.
+- Default configuration improvements: filter messages about missing packager,
+  Mandriva specific package naming conventions, %%ghost files without
+  %%post scriptlets, and 0664 source permissions.
+- Exclude check-install.py, it doesn't currently work with rpm >= 4.2.
+- Convert docs to UTF-8.
+- Improve summary.
+
 * Sun Mar 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.68-1
 - 0.68, siteperl patch applied upstream.
 - Fix "no-dependency-on" filtering in default config.
diff --git a/sources b/sources
index df0dd03..5cda631 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e321c9868b403366d314c77e637e09b9  rpmlint-0.68.tar.bz2
+5e5bc5e2d493e35e300b7498824fee1d  rpmlint-0.69.tar.bz2