diff --git a/patches.tar.bz2 b/patches.tar.bz2
index abbd07c..5e30370 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:92de76e6d4e665c3983304ca2158577f72dfae275dbdd79b9505446615fa57b6
-size 37272
+oid sha256:a63d4e18c45a619eb5590eb5a9c591ab21c9fce0adf9082b6f442daa2b382545
+size 37281
diff --git a/samba-doc.spec b/samba-doc.spec
index cc3c71b..72ac8c2 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -129,7 +129,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3028
+%define SOURCE_TIMESTAMP 3030
 %define BRANCH %{version}
 Version:        3.6.16
 Release:        0
@@ -251,15 +251,12 @@ product_version="${major_version}.${minor_version}"
 product_suffix=""
 if test "%{VENDOR}" != "UL"; then
 	if test 0%{?sles_version} -gt 0; then
-		product_suffix="-SLES%{sles_version}"
+		product_suffix="-SLE_%{sles_version}"
 	elif test 0%{?suse_version} -gt 0; then
-		product_suffix="-SL${product_version}"
+		product_suffix="-oS${product_version}"
 	else
 		product_suffix="-OBS"
 	fi
-	case "%{?suse_version}" in
-		1010|1110) product_suffix="-CODE${major_version}" ;;
-	esac
 fi
 # Add the build architecture
 test "%{_build_arch}" != "" && \
diff --git a/samba.changes b/samba.changes
index e05b887..a2f540b 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul  1 17:34:32 UTC 2013 - lmuelle@suse.com
+
+- Use SLE as product prefix for SUSE Linux Enterprise, oS for openSUSE, and
+  OBS for any other operating system to define the vendor string while build.
+
 -------------------------------------------------------------------
 Fri Jun 28 16:49:31 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 81f96e5..64f8184 100644
--- a/samba.spec
+++ b/samba.spec
@@ -129,7 +129,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3028
+%define SOURCE_TIMESTAMP 3030
 %define BRANCH %{version}
 Version:        3.6.16
 Release:        0
@@ -701,15 +701,12 @@ product_version="${major_version}.${minor_version}"
 product_suffix=""
 if test "%{VENDOR}" != "UL"; then
 	if test 0%{?sles_version} -gt 0; then
-		product_suffix="-SLES%{sles_version}"
+		product_suffix="-SLE_%{sles_version}"
 	elif test 0%{?suse_version} -gt 0; then
-		product_suffix="-SL${product_version}"
+		product_suffix="-oS${product_version}"
 	else
 		product_suffix="-OBS"
 	fi
-	case "%{?suse_version}" in
-		1010|1110) product_suffix="-CODE${major_version}" ;;
-	esac
 fi
 # Add the build architecture
 test "%{_build_arch}" != "" && \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 78dc84e..65cd042 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:7ec8ea0364a922a25d84ab4043e4bcd4c88b17657e78e86b94ce5db8c6890688
-size 53566
+oid sha256:8710e02e7058c37f8d49040c6d7e3a2c25a353fac11fbf85a35f0e6ab9772ee3
+size 53568