diff --git a/.cvsignore b/.cvsignore
index f52f584..b4c2c43 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-authconfig-6.1.6.tar.bz2
+authconfig-6.1.7.tar.bz2
diff --git a/authconfig-6.1.4-ldap-packages.patch b/authconfig-6.1.4-ldap-packages.patch
deleted file mode 100644
index 2566955..0000000
--- a/authconfig-6.1.4-ldap-packages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 0f3b95c86b85 authconfig.py
---- a/authconfig.py	Tue Jun 22 16:45:38 2010 +0000
-+++ b/authconfig.py	Mon Jul 12 16:01:28 2010 +0200
-@@ -522,8 +522,8 @@
- 		warnCache = [authinfo.PATH_NSCD, _("caching"), "nscd", None]
- 		warnFprintd = [authinfo.PATH_PAM_FPRINTD, _("Fingerprint reader"), "pam_fprintd", None]
- 		warnKerberos = [authinfo.PATH_PAM_KRB5, _("Kerberos"), "pam_krb5", None]
--		warnLDAPAuth = [authinfo.PATH_PAM_LDAP, _("LDAP authentication"), "nss_ldap", None]
--		warnLDAP = [authinfo.PATH_LIBNSS_LDAP, _("LDAP"), "nss_ldap", None]
-+		warnLDAPAuth = [authinfo.PATH_PAM_LDAP, _("LDAP authentication"), "pam_ldap", None]
-+		warnLDAP = [authinfo.PATH_LIBNSS_LDAP, _("LDAP"), "nss-pam-ldapd", None]
- 		warnNIS = [authinfo.PATH_YPBIND, _("NIS"), "ypbind", None]
- 		warnShadow = [authinfo.PATH_PWCONV, _("shadow password"), "shadow-utils", None]
- 		warnWinbindNet = [authinfo.PATH_WINBIND_NET, _("Winbind"), "samba-client", None]
diff --git a/authconfig.spec b/authconfig.spec
index 0e13c23..c711d3e 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -1,14 +1,13 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
-Version: 6.1.6
-Release: 2%{?dist}
+Version: 6.1.7
+Release: 1%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
-Patch1: authconfig-6.1.4-ldap-packages.patch
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254, sssd < 0.99.1
@@ -35,7 +34,6 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .ldap-packages
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -112,8 +110,9 @@ authconfig --update --nostart >/dev/null 2>&1 || :
 %{_datadir}/icons/hicolor/48x48/apps/system-config-authentication.*
 
 %changelog
-* Mon Jul 12 2010 Tomas Mraz <tmraz@redhat.com> - 6.1.6-2
-- use current ldap packages in the warnings
+* Thu Jul 15 2010 Tomas Mraz <tmraz@redhat.com> - 6.1.7-1
+- fix startup of NIS services (#614856)
+- fix packages for LDAP id and auth in authconfig-tui
 
 * Thu Jun 10 2010 Tomas Mraz <tmraz@redhat.com> - 6.1.6-1
 - remove superfluous space in nsswitch.conf (#595265)
diff --git a/sources b/sources
index 65c8995..1acfb11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e512be369aea2b891f44cb05304285b1  authconfig-6.1.6.tar.bz2
+bbd7724c4b069dffa99cf69a1384748b  authconfig-6.1.7.tar.bz2