diff --git a/patches.tar.bz2 b/patches.tar.bz2
index f5a2ad9..d9c9d3e 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecebfac71eff40a893f12f8667e995995efd087d005051141bb7370e5b8d12c6
-size 335649
+oid sha256:2e8dc9f645c3d48dac098be0a09a37824875da45c3e0dec2e98228dfb46563a2
+size 333857
diff --git a/samba-4.1.16.tar.asc b/samba-4.1.16.tar.asc
deleted file mode 100644
index 92266ad..0000000
--- a/samba-4.1.16.tar.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlS0Me8ACgkQbzORW2Vot+rNSwCeIcyXGjSZbZbIQF1nD2GSnFzp
-KeIAniilFAaGNlBrpIhewZImFLcvZLWm
-=ICvU
------END PGP SIGNATURE-----
diff --git a/samba-4.1.16.tar.gz b/samba-4.1.16.tar.gz
deleted file mode 100644
index 973366e..0000000
--- a/samba-4.1.16.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12a09c167bfa25f50b82775bcbeda94c71c5d71d3b0d1210f6dae0f23020a87b
-size 19534236
diff --git a/samba-4.1.17.tar.asc b/samba-4.1.17.tar.asc
new file mode 100644
index 0000000..fd6c46f
--- /dev/null
+++ b/samba-4.1.17.tar.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlTo5pMACgkQbzORW2Vot+pOCQCfZUOKXwrtIJ29JjjPYHWK9aPj
+eTsAnindslQRa3IhABkLWgD3hKEzZeil
+=dw55
+-----END PGP SIGNATURE-----
diff --git a/samba-4.1.17.tar.gz b/samba-4.1.17.tar.gz
new file mode 100644
index 0000000..38c81d0
--- /dev/null
+++ b/samba-4.1.17.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d
+size 19536407
diff --git a/samba.changes b/samba.changes
index 59cc9f9..dca1ab2 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Feb 24 16:23:16 UTC 2015 - ddiss@suse.com
+
+- Fix tdb_store_flag_to_ntdb() gcc5 build failure.
+
+-------------------------------------------------------------------
+Thu Feb 12 13:25:42 UTC 2015 - lmuelle@suse.com
+
+- Update to 4.1.17.
+  + Ensure we don't call talloc_free on an uninitialized pointer;
+    CVE-2015-0240; (bso#11077); (bnc#917376).
+
 -------------------------------------------------------------------
 Thu Jan 22 14:03:52 UTC 2015 - ddiss@suse.com
 
@@ -189,7 +201,8 @@ Tue Sep 23 12:02:16 UTC 2014 - lmuelle@suse.com
 - Update to 4.1.12.
   + s3: winbindd: On new client connect, prune idle or hung connections older
     than "winbind request timeout". Add new parameter "winbind request
-    timeout". Please see smb.conf man page for details; (bso#3204).
+    timeout". Please see smb.conf man page for details; (bso#3204);
+    (bnc#872912).
   + Fix smbd crashes when filename contains non-ascii character; (bso#10716).
   + s4-rpc: dnsserver: Handle updates of tombstoned dnsNode objects;
     (bso#10749).
diff --git a/samba.spec b/samba.spec
index ce427f7..b12301e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -122,7 +122,7 @@ BuildRequires:  libavahi-devel
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
-%define	samba_ver 4.1.16
+%define	samba_ver 4.1.17
 %define	samba_ver_suffix %nil
 %if "%{samba_ver_suffix}" == ""
 %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@@ -146,11 +146,11 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3357
+%define SOURCE_TIMESTAMP 3377
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
-Version:        4.1.16
+Version:        4.1.17
 Release:        0
 Url:            http://www.samba.org/
 Provides:       samba-gplv3 = %{version}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 737d724..33a486f 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21fe60031951e7a0b823780c1d0c41ca8bf3867d6d736f0f2ad1c7c62a25e187
-size 54211
+oid sha256:1dce069735a51838c7f75da58b4a4f03df6265c46e310b0d27398e5f86d63645
+size 54401