diff --git a/authconfig-6.2.10-byteconv.patch b/authconfig-6.2.10-byteconv.patch
index 95f64cc..1ed0ae4 100644
--- a/authconfig-6.2.10-byteconv.patch
+++ b/authconfig-6.2.10-byteconv.patch
@@ -1,15 +1,7 @@
-# HG changeset patch
-# User Tomas Mraz <tmraz@redhat.com>
-# Date 1431355347 -7200
-#      Mon May 11 16:42:27 2015 +0200
-# Node ID c49c3efbbb73010ac47972a477f61415d09ed58f
-# Parent  69a7954def822e4c7b8841024b0230b9dd6f0d8b
-Fix additional Python3 compatibility problems.
-
-diff -r 69a7954def82 -r c49c3efbbb73 authinfo.py
---- a/authinfo.py	Tue May 05 16:58:22 2015 +0200
-+++ b/authinfo.py	Mon May 11 16:42:27 2015 +0200
-@@ -904,9 +904,9 @@
+diff -up authconfig-6.2.10/authinfo.py.byteconv authconfig-6.2.10/authinfo.py
+--- authconfig-6.2.10/authinfo.py.byteconv	2015-05-11 16:50:15.608497236 +0200
++++ authconfig-6.2.10/authinfo.py	2015-05-11 16:51:56.303867029 +0200
+@@ -904,9 +904,9 @@ def feedFork(command, echo, query, respo
  	if not pid:
  		# child
  		if query:
@@ -21,7 +13,7 @@ diff -r 69a7954def82 -r c49c3efbbb73 authinfo.py
  			child.communicate(input=(response or '')+'\n')
  
  		# wait for the child to terminate & set the returncode
-@@ -1005,8 +1005,8 @@
+@@ -1005,8 +1005,8 @@ def isEmptyDir(path):
  
  def callPKCS11Setup(options):
  	try:
@@ -32,16 +24,23 @@ diff -r 69a7954def82 -r c49c3efbbb73 authinfo.py
  		if child.returncode != 0:
  			return None
  		if lst[-1] == '':
-@@ -4313,7 +4313,7 @@
- 			if self.joinPassword or not echo:
- 				status, error = feedFork(cmd, echo, "sword:", self.joinPassword)
- 			else:
+@@ -4310,11 +4310,12 @@ class AuthInfo:
+ 			
+ 			if echo:
+ 				sys.stderr.write("[%s]\n" % cmd)
 -				child = Popen([cmd], shell=True)
++			if self.joinPassword or not echo:
++				status, error = feedFork(cmd, echo, "sword:", self.joinPassword)
++			else:
 +				child = Popen([cmd], shell=True, universal_newlines=True)
  				child.communicate()
  				status = child.returncode
+-			else:
+-				status, error = feedFork(cmd, echo, "sword:", self.joinPassword)
  			if echo:
-@@ -4348,7 +4348,7 @@
+ 				if status != 0:
+ 					self.messageCB(_("Winbind domain join was not successful."))
+@@ -4347,7 +4348,7 @@ class AuthInfo:
  
  			if echo:
  				sys.stderr.write("[%s]\n" % cmd)
@@ -50,7 +49,16 @@ diff -r 69a7954def82 -r c49c3efbbb73 authinfo.py
  				child.communicate()
  				status = child.returncode
  			else:
-@@ -4487,7 +4487,7 @@
+@@ -4366,7 +4367,7 @@ class AuthInfo:
+ 		return status == 0
+ 
+ 	def uninstallIPA(self):
+-		cmd = PATH_IPA_CLIENT_INSTALL + " --uninstall --noac"
++		cmd = PATH_IPA_CLIENT_INSTALL + " --uninstall --noac --unattended"
+ 		os.system(cmd)
+ 
+ 	def toggleCachingService(self, nostart):
+@@ -4486,7 +4487,7 @@ class AuthInfo:
  		try:
  			readf = request.urlopen(self.ldapCacertURL)
  			writef = openLocked(self.ldapCacertDir + "/" + LDAP_CACERT_DOWNLOADED, 0o644)
diff --git a/authconfig.spec b/authconfig.spec
index 8dbecf7..10f1ffc 100644
--- a/authconfig.spec
+++ b/authconfig.spec
@@ -149,6 +149,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Mon May 11 2015 Tomáš Mráz <tmraz@redhat.com> - 6.2.10-8
 - more Python 3 compatibility fixes
+- fix IPA uninstall lockup
+- supply the joinpassword to Winbind join command if available
 
 * Tue May  5 2015 Tomáš Mráz <tmraz@redhat.com> - 6.2.10-7
 - use gettext() instead of lgettext() (#1215284)