diff --git a/.cvsignore b/.cvsignore
index 66c5520..335b461 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,9 +1,2 @@
-NetworkManager-0.6.1.tar.bz2
-NetworkManager-0.7.0.cvs20060521.tar.gz
-NetworkManager-0.7.0.cvs20060529.tar.gz
-NetworkManager-0.6.4.cvs20060829.tar.gz
-NetworkManager-0.6.5.cvs20061025.tar.gz
-NetworkManager-0.6.5.svn2474.tar.gz
-nm-applet-0.6.5.svn63.tar.gz
-NetworkManager-0.6.5.svn2547.tar.gz
-nm-applet-0.6.5.svn71.tar.gz
+network-manager-applet-0.6.5.tar.bz2
+NetworkManager-0.6.5.tar.bz2
diff --git a/NetworkManager.spec b/NetworkManager.spec
index aa9fc57..d89c4fa 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -10,12 +10,12 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.6.5
-Release: 0.7.svn2547%{?dist}
+Release: 1%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
-Source: %{name}-%{version}.svn2547.tar.gz
-Source1: nm-applet-0.6.5.svn71.tar.gz
+Source: %{name}-%{version}.tar.bz2
+Source1: network-manager-applet-%{version}.tar.bz2
 Patch0: NetworkManager-0.6.4-startup-dhcdbd.patch
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: NetworkManager-0.6.5-wpa_supplicant-debug.patch
@@ -246,6 +246,10 @@ fi
 
 
 %changelog
+* Thu Apr 19 2007 Christopher Aillon <caillon@redhat.com> 1:0.6.5-1
+- Update to 0.6.5 final
+- Don't lose scanned security information
+
 * Mon Apr  9 2007 Dan Williams  <dcbw@redhat.com> - 1:0.6.5-0.7.svn2547
 - Update from trunk
     - Updated translations
diff --git a/sources b/sources
index 5792a1b..31e93bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bb96eb758e4e2156f15cbc863580f0a1  NetworkManager-0.6.5.svn2547.tar.gz
-6705d870f81ccc89f3a7edbe4a6870e8  nm-applet-0.6.5.svn71.tar.gz
+b827d300eb28458f6588eb843cba418d  NetworkManager-0.6.5.tar.bz2
+1c94a41e2399d261985a75f0cd3b895b  network-manager-applet-0.6.5.tar.bz2