diff --git a/.gitignore b/.gitignore
index 88c170b..9e1908b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.2.1.tar.xz
 /samba-4.2.2.tar.xz
 /samba-4.2.3.tar.xz
+/samba-4.2.5.tar.xz
diff --git a/samba-4.2-auth-credentials-if-credentials-have-principal-set-t.patch b/samba-4.2-auth-credentials-if-credentials-have-principal-set-t.patch
deleted file mode 100644
index f6ae63a..0000000
--- a/samba-4.2-auth-credentials-if-credentials-have-principal-set-t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 97d7bc19bb463cfbb9d45b69cec1e668eb15b4a1 Mon Sep 17 00:00:00 2001
-From: Alexander Bokovoy <ab@samba.org>
-Date: Thu, 7 May 2015 14:12:03 +0000
-Subject: [PATCH] auth/credentials: if credentials have principal set, they are
- not anonymous anymore
-
-When dealing with Kerberos, we cannot consider credentials anonymous
-if credentials were obtained properly.
-
-Signed-off: Alexander Bokovoy <ab@samba.org>
----
- auth/credentials/credentials.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c
-index 78b5955..b1ccc5a 100644
---- a/auth/credentials/credentials.c
-+++ b/auth/credentials/credentials.c
-@@ -921,6 +921,13 @@ _PUBLIC_ bool cli_credentials_is_anonymous(struct cli_credentials *cred)
- 						    cred->machine_account_pending_lp_ctx);
- 	}
- 
-+	if (cli_credentials_get_kerberos_state(cred) != CRED_DONT_USE_KERBEROS) {
-+		/* if principal is set, it's not anonymous */
-+		if (cred->principal && cred->principal_obtained >= cred->username_obtained) {
-+			return false;
-+		}
-+	}
-+
- 	username = cli_credentials_get_username(cred);
- 	
- 	/* Yes, it is deliberate that we die if we have a NULL pointer
--- 
-2.4.0
-
diff --git a/samba.spec b/samba.spec
index c7ad45a..f8495f3 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,7 +8,7 @@
 
 %define main_release 0
 
-%define samba_version 4.2.3
+%define samba_version 4.2.5
 %define talloc_version 2.1.2
 %define ntdb_version 1.0
 %define tdb_version 1.3.6
@@ -99,8 +99,6 @@ URL:            http://www.samba.org/
 
 Source0:        samba-%{version}%{pre_release}.tar.xz
 
-Patch3:         samba-4.2-auth-credentials-if-credentials-have-principal-set-t.patch
-
 # Red Hat specific replacement-files
 Source1: samba.log
 Source2: samba.xinetd
@@ -646,8 +644,6 @@ and use CTDB instead.
 %prep
 %setup -q -n samba-%{version}%{pre_release}
 
-%patch3 -p1 -b .samba-4.2-auth-credentials-if-credentials-have-principal-set-t.patch
-
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
 %global _tevent_lib ,tevent,pytevent
@@ -1945,6 +1941,9 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Mon Nov 09 2015 Guenther Deschner <gdeschner@redhat.com> - 4.2.5-0
+- Update to Samba 4.2.5
+
 * Tue Jul 14 2015 Guenther Deschner <gdeschner@redhat.com> - 4.2.3-0
 - resolves: #1088911 - Update to Samba 4.2.3
 
diff --git a/sources b/sources
index ef33e31..cf77d3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b992c6b1492c12c07b1c24d4eed1214  samba-4.2.3.tar.xz
+c328cec16352b461f140a865c26b6c38  samba-4.2.5.tar.xz