diff --git a/.cvsignore b/.cvsignore
index b84e1db..ca4a21a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,6 +1 @@
-authconfig-4.6.4-2.tar.bz2
-authconfig-4.6.4-3.tar.bz2
-authconfig-4.6.4-4.tar.bz2
-authconfig-4.6.4-5.tar.bz2
-authconfig-4.6.4-6.tar.bz2
-authconfig-4.6.5.tar.bz2
+authconfig-4.6.6.tar.gz
diff --git a/authconfig.spec b/authconfig.spec
index 59d9dc7..ae665d5 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,20 +1,19 @@
 Summary: Text-mode tool for setting up NIS and shadow passwords.
 Name: authconfig
-Version: 4.6.5
-Release: 6
+Version: 4.6.6
+# Don't change release in elvis CVS, up version after merging all patches
+# from dist CVS instead.
+Release: 1
 License: GPL
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
 Requires: glibc >= 2.1, glib2, pam >= 0.77-56, nscd
 Requires: python >= %(%{__python} -c "import sys; print sys.version[:3]")
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 BuildPrereq: pam-devel >= 0.77, newt-devel, glib2-devel, python, python-devel
 BuildPrereq: desktop-file-utils, intltool, gettext, perl-XML-Parser
-Patch1: authconfig-4.6.5-restart-autofs.patch
-Patch2: authconfig-4.6.5-add-brokenshadow.patch
-Patch3: authconfig-4.6.5-setsebool.patch
 
 %description 
 Authconfig is a terminal mode program which can configure a workstation
@@ -40,10 +39,6 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .restart-autofs
-%patch2 -p1 -b .add-brokenshadow
-%patch3 -p1 -b .setsebool
-./autogen.sh
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -86,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Nov 18 2004 Tomas Mraz <tmraz@redhat.com> - 4.6.6-1
+- merged patches from dist
+- fix versioning
+
 * Mon Nov  8 2004 Jeremy Katz <katzj@redhat.com> - 4.6.5-6
 - rebuild against python 2.4
 
diff --git a/sources b/sources
index b46bbef..91fb3d4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90c9bffc229591da9e45234b2b004ffc  authconfig-4.6.5.tar.bz2
+097ca9ce58e5ca6f625fae82db715523  authconfig-4.6.6.tar.gz