diff --git a/.cvsignore b/.cvsignore
index db4b16d..0dcb009 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setup-2.8.4.tar.bz2
+setup-2.8.5.tar.bz2
diff --git a/setup.spec b/setup.spec
index a49227f..32d57a2 100644
--- a/setup.spec
+++ b/setup.spec
@@ -1,6 +1,6 @@
 Summary: A set of system configuration and setup files
 Name: setup
-Version: 2.8.4
+Version: 2.8.5
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -89,6 +89,13 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 %changelog
+* Wed May 20 2009 Ondrej Vasik <ovasik@redhat.com> 2.8.5-1
+- use history-search-backward/forward for pageup/pagedown
+  mapping in inputrc (#500989)
+- add HISTCONTROL="ignoreboth" to /etc/profile to not include
+  duplicities and lines starting with space into the history
+  (#500819)
+
 * Tue May 12 2009 Ondrej Vasik <ovasik@redhat.com> 2.8.4-1
 - add oprofile (16:16) to uidgid
 - use os.remove instead of os.execute in lua post
diff --git a/sources b/sources
index f4a97b4..4b0822e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3569d161fc363f5b80b8dda64d283a6  setup-2.8.4.tar.bz2
+46847c2699174721a910001dc5d72325  setup-2.8.5.tar.bz2