diff --git a/.cvsignore b/.cvsignore
index 8b5cba9..0229646 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-authconfig-4.3.8-1.tar.gz
+authconfig-4.6-1.tar.gz
diff --git a/authconfig.spec b/authconfig.spec
index 3fc705a..687b64f 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,6 +1,6 @@
 Summary: Text-mode tool for setting up NIS and shadow passwords.
 Name: authconfig
-Version: 4.3.8
+Version: 4.6
 Release: 1
 License: GPL
 ExclusiveOS: Linux
@@ -8,9 +8,10 @@ Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-root
 Source: %{name}-%{version}-%{release}.tar.gz
 Requires: glibc >= 2.1, pam >= 0.73, glib2, pam >= 0.75-43
-Conflicts: pam_krb5 < 1.49
+Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 BuildPrereq: pam-devel >= 0.73, newt-devel, glib2-devel, python, python-devel
 BuildPrereq: desktop-file-utils
+Requires: usermode
 
 %description 
 Authconfig is a terminal mode program which can configure a workstation
@@ -21,7 +22,7 @@ authentication schemes.
 %package gtk
 Summary: Graphical tool for setting up NIS and shadow passwords.
 Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}, pygtk2-libglade, pam >= 0.75-37
+Requires: %{name} = %{version}-%{release}, pygtk2-libglade, pam >= 0.75-37, rhpl
 
 %description gtk
 Authconfig-gtk is a GUI program which can configure a workstation
@@ -49,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc NOTES TODO
+%doc NOTES TODO README.samba3
 %ghost %config(noreplace) %{_sysconfdir}/sysconfig/authconfig
 %{_bindir}/authconfig
 %{_sbindir}/authconfig
@@ -62,15 +63,44 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_bindir}/authconfig-gtk
 %{_bindir}/redhat-config-authentication
+%{_bindir}/system-config-authentication
 %{_datadir}/%{name}
 %config(noreplace) %{_sysconfdir}/pam.d/authconfig-gtk
 %config(noreplace) %{_sysconfdir}/pam.d/redhat-config-authentication
+%config(noreplace) %{_sysconfdir}/pam.d/system-config-authentication
 %config(noreplace) %{_sysconfdir}/security/console.apps/authconfig-gtk
 %config(noreplace) %{_sysconfdir}/security/console.apps/redhat-config-authentication
+%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-authentication
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Jan  8 2004 Nalin Dahyabhai <nalin@redhat.com> 4.6-1
+- authconfig-gtk.py: require rhpl, which is required by the script (#104209)
+- both: require usermode (authconfig-gtk transitively), else leave a dangling
+  symlink (#104209)
+- the great redhat-config-authentication/system-config-authentication renaming,
+  as was foretold in the fedora-config-list archives
+
+* Wed Jan  7 2004 Nalin Dahyabhai <nalin@redhat.com>
+- preserve "compat" if it's used in /etc/nsswitch.conf
+
+* Tue Nov 18 2003 Nalin Dahyabhai <nalin@redhat.com> 4.4-1
+- add options for toggling krb5's use of DNS
+
+* Mon Nov 17 2003 Nalin Dahyabhai <nalin@redhat.com>
+- rework tui to include winbind options. there wasn't enough room in the old
+  dialog to include the important options, so the whole thing's been reworked
+
+* Thu Nov 13 2003 Nalin Dahyabhai <nalin@redhat.com>
+- conflict with older versions of samba which expect different configuration
+
+* Mon Nov 10 2003 Nalin Dahyabhai <nalin@redhat.com>
+- initial support for configuring winbind
+
+* Tue Oct 28 2003 Nalin Dahyabhai <nalin@redhat.com>
+- make pam_cracklib requisite instead of required in generated PAM configs
+
 * Wed Oct 22 2003 Bill Nottingham <notting@redhat.com> 4.3.8-1
 - rebuild with current translations
 
diff --git a/sources b/sources
index 08d678d..6d70d47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5699dbb57b741007e8eb13b6bcb0f694  authconfig-4.3.8-1.tar.gz
+d7bc1387c741ab59a48d58648ddd068c  authconfig-4.6-1.tar.gz