diff --git a/.cvsignore b/.cvsignore
index e8c0c3f..7b52e58 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-git-1.6.2.tar.bz2
+git-1.6.2.2.tar.bz2
diff --git a/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
new file mode 100644
index 0000000..37a22dd
--- /dev/null
+++ b/git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
@@ -0,0 +1,26 @@
+From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001
+From: Todd Zullinger <tmz@pobox.com>
+Date: Mon, 23 Mar 2009 00:03:36 -0400
+Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output
+
+Signed-off-by: Todd Zullinger <tmz@pobox.com>
+---
+ git-cvsimport.perl |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/git-cvsimport.perl b/git-cvsimport.perl
+index e439202..d020f1a 100755
+--- a/git-cvsimport.perl
++++ b/git-cvsimport.perl
+@@ -952,7 +952,7 @@ while (<CVS>) {
+ 	} elsif (/^-+$/) { # end of unknown-line processing
+ 		$state = 1;
+ 	} elsif ($state != 11) { # ignore stuff when skipping
+-		print STDERR "* UNKNOWN LINE * $_\n";
++		print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /;
+ 	}
+ }
+ commit() if $branch and $state != 11;
+-- 
+1.6.2.2
+
diff --git a/git.spec b/git.spec
index 90f9bd2..f2d67c2 100644
--- a/git.spec
+++ b/git.spec
@@ -1,6 +1,6 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:           git
-Version:        1.6.2
+Version:        1.6.2.2
 Release:        1%{?dist}
 Summary:        Core git tools
 License:        GPLv2
@@ -11,6 +11,8 @@ Source1:        git-init.el
 Source2:        git.xinetd
 Source3:        git.conf.httpd
 Patch0:         git-1.5-gitweb-home-link.patch
+# https://bugzilla.redhat.com/490602
+Patch1:         git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch
 BuildRequires:  zlib-devel >= 1.2, openssl-devel, libcurl-devel, expat-devel, emacs, gettext %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +142,7 @@ Requires:       git = %{version}-%{release}, emacs-common
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Use these same options for every invocation of 'make'.
 # Otherwise it will rebuild in %%install due to flags changes.
@@ -147,7 +150,6 @@ Requires:       git = %{version}-%{release}, emacs-common
 make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
      ETC_GITCONFIG=%{_sysconfdir}/gitconfig \\\
      DESTDIR=$RPM_BUILD_ROOT \\\
-     DOCBOOK_XSL_172=YesPlease \\\
      INSTALL="install -p" \\\
      INSTALLDIRS=vendor \\\
      htmldir=%{_docdir}/%{name}-%{version} \\\
@@ -157,6 +159,12 @@ make %{_smp_mflags} V=1 CFLAGS="$RPM_OPT_FLAGS" \\\
 %{make_git} all %{!?_without_docs: doc}
 make -C contrib/emacs
 
+# Work around odd manpage issues (bug #485161)
+grep -rl '\\&\.ft' Documentation/ | xargs -i sed -i 's/\\&\.ft/.ft/g' {}
+
+# Remove shebang from bash-completion script
+sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{make_git} install %{!?_without_docs: install-doc}
@@ -195,8 +203,9 @@ install -pm 644 -T contrib/completion/git-completion.bash $RPM_BUILD_ROOT%{_sysc
 
 # quiet some rpmlint complaints
 chmod g-w $RPM_BUILD_ROOT%{_libexecdir}/git-core/*
-rm -f Documentation/technical/.gitignore
+rm -f {Documentation/technical,contrib/emacs}/.gitignore
 chmod a-x Documentation/technical/api-index.sh
+find contrib -type f -perm /a+x | xargs chmod -x
 
 
 %clean
@@ -207,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/git-core/
 %dir %{_libexecdir}/git-core/
-%doc README COPYING Documentation/*.txt contrib/hooks
+%doc README COPYING Documentation/*.txt contrib/
 %{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css}
 %{!?_without_docs: %doc Documentation/howto Documentation/technical}
 %{_sysconfdir}/bash_completion.d
@@ -280,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n gitweb
 %defattr(-,root,root)
+%doc gitweb/README
 %{_var}/www/git/
 %config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
 
@@ -288,6 +298,14 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Fri Apr 03 2009 Todd Zullinger <tmz@pobox.com> - 1.6.2.2-1
+- git-1.6.2.2
+- Include contrib/ dir in %%doc (bug 492490)
+- Don't set DOCBOOK_XSL_172, fix the '\&.ft' with sed (bug 485161)
+- Ignore Branches output from cvsps-2.2b1 (bug 490602)
+- Remove shebang from bash-completion script
+- Include README in gitweb subpackage
+
 * Mon Mar 09 2009 Todd Zullinger <tmz@pobox.com> - 1.6.2-1
 - git-1.6.2
 - Include contrib/emacs/README in emacs subpackage
diff --git a/sources b/sources
index 06f7e08..7b92812 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12c7d874e17c6e111697b1714b5f4319  git-1.6.2.tar.bz2
+d219aa5480ed6396f8ab968f3f7eb0f9  git-1.6.2.2.tar.bz2