diff --git a/.cvsignore b/.cvsignore
index 21852c0..dd5767e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-git-1.6.5.rc2.tar.bz2
+git-1.6.5.tar.bz2
diff --git a/git-1.6-update-contrib-hooks-path.patch b/git-1.6-update-contrib-hooks-path.patch
index cfa3817..a4220ad 100644
--- a/git-1.6-update-contrib-hooks-path.patch
+++ b/git-1.6-update-contrib-hooks-path.patch
@@ -33,7 +33,7 @@ index 18d2e0f..cf57878 100755
 --- a/templates/hooks--post-receive.sample
 +++ b/templates/hooks--post-receive.sample
 @@ -12,4 +12,4 @@
- # see contrib/hooks/ for an sample, or uncomment the next line and
+ # see contrib/hooks/ for a sample, or uncomment the next line and
  # rename the file to "post-receive".
  
 -#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
diff --git a/git.spec b/git.spec
index ccb0f29..d5348d7 100644
--- a/git.spec
+++ b/git.spec
@@ -1,13 +1,12 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
-%global snap .rc2
 Name:           git
 Version:        1.6.5
-Release:        0.2%{?snap}%{?dist}
+Release:        1%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 Group:          Development/Tools
 URL:            http://git-scm.com/
-Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}%{?snap}.tar.bz2
+Source0:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.bz2
 Source1:        git-init.el
 Source2:        git.xinetd
 Source3:        git.conf.httpd
@@ -187,7 +186,7 @@ Requires:       git = %{version}-%{release}, emacs-common >= 22.2
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}%{?snap}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -213,7 +212,7 @@ cat << \EOF > %{name}-req
 sed -e '/perl(packed-refs)/d'
 EOF
 
-%global __perl_requires %{_builddir}/%{name}-%{version}%{?snap}/%{name}-req
+%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
 chmod +x %{__perl_requires}
 
 %build
@@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
 # No files for you!
 
 %changelog
+* Sun Oct 11 2009 Todd Zullinger <tmz@pobox.com> - 1.6.5-1
+- git-1.6.5
+
 * Mon Sep 28 2009 Todd Zullinger <tmz@pobox.com> - 1.6.5-0.2.rc2
 - git-1.6.5.rc2
 - Enable Linus' block-sha1 implementation
diff --git a/sources b/sources
index 5030125..36246ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e9cfec47e38232948dc90188927f7782  git-1.6.5.rc2.tar.bz2
+da86c1736c55edb9f446828581137b51  git-1.6.5.tar.bz2