diff --git a/.gitignore b/.gitignore
index 948254d..25b1f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/postgresql-8.4.5.tar.bz2
-/postgresql-8.4.5-US.pdf
+/postgresql-8.4.6.tar.bz2
+/postgresql-8.4.6-US.pdf
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch
index 53c774a..f45ebe2 100644
--- a/postgresql-ac-version.patch
+++ b/postgresql-ac-version.patch
@@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world.
 Dike out the check.
 
 
-diff -Naur postgresql-8.4.5.orig/configure.in postgresql-8.4.5/configure.in
---- postgresql-8.4.5.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
-+++ postgresql-8.4.5/configure.in	2009-09-04 13:03:07.000000000 -0400
+diff -Naur postgresql-8.4.6.orig/configure.in postgresql-8.4.6/configure.in
+--- postgresql-8.4.6.orig/configure.in	2009-09-03 20:36:50.000000000 -0400
++++ postgresql-8.4.6/configure.in	2009-09-04 13:03:07.000000000 -0400
 @@ -19,10 +19,6 @@
  
- AC_INIT([PostgreSQL], [8.4.5], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.6], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/postgresql.spec b/postgresql.spec
index cc232db..d18c879 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -52,7 +52,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 8.4
-Version: 8.4.5
+Version: 8.4.6
 Release: 1%{?dist}
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -287,6 +287,9 @@ autoconf
 
 cp -p %{SOURCE1} .
 
+# remove .gitignore files to ensure none get into the RPMs (bug #642210)
+find . -type f -name .gitignore | xargs rm
+
 %build
 
 # fail quickly and obviously if user tries to build as root
@@ -357,8 +360,7 @@ CFLAGS="$CFLAGS -DLINUX_OOM_ADJ=0"
 %endif
 	--with-system-tzdata=/usr/share/zoneinfo \
 	--sysconfdir=/etc/sysconfig/pgsql \
-	--datadir=/usr/share/pgsql \
-	--with-docdir=%{_docdir}
+	--datadir=/usr/share/pgsql
 
 make %{?_smp_mflags} all
 make %{?_smp_mflags} -C contrib all
@@ -714,6 +716,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Dec 16 2010 Tom Lane <tgl@redhat.com> 8.4.6-1
+- Update to PostgreSQL 8.4.6, for various fixes described at
+  http://www.postgresql.org/docs/8.4/static/release-8-4-6.html
+- Ensure we don't package any .gitignore files from the source tarball
+Related: #642210
+
 * Tue Oct  5 2010 Tom Lane <tgl@redhat.com> 8.4.5-1
 - Update to PostgreSQL 8.4.5, for various fixes described at
   http://www.postgresql.org/docs/8.4/static/release-8-4-5.html
diff --git a/sources b/sources
index 5f91317..2f6eb3d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-391a3f2eddd6fa78bb6ceba9955ffa5f  postgresql-8.4.5.tar.bz2
-b1eb40dd133acb73671c8862a45ed9c9  postgresql-8.4.5-US.pdf
+fcc3daaf2292fa6bf1185ec45e512db6  postgresql-8.4.6.tar.bz2
+9c5e14846e614da71807d5a09a2232dc  postgresql-8.4.6-US.pdf