diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 2bf3f0a..430a1fe 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c73596b6d2f31cac1469e56359424526f342e4f4dc23cd1613f4235db92666d9
-size 329066
+oid sha256:a1d19f1357be061cd1176364f2e6c5f7716d3ed5311d0f26d17db2c4286af84e
+size 328975
diff --git a/samba.changes b/samba.changes
index 9efa601..f9a57b6 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jan 13 13:28:31 UTC 2015 - mpluskal@suse.com
+
+- Enable avahi support on post-12.2 systems.
+
 -------------------------------------------------------------------
 Tue Jan 13 13:01:11 UTC 2015 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 2d2bf82..71a9e95 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package samba
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -118,6 +118,7 @@ BuildRequires:  dbus-1-devel
 BuildRequires:  libxslt-tools
 %endif
 %if 0%{?suse_version} > 1220
+BuildRequires:  libavahi-devel
 BuildRequires:  systemd
 BuildRequires:  systemd-devel
 %endif
@@ -145,7 +146,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3345
+%define SOURCE_TIMESTAMP 3346
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1200,6 +1201,7 @@ CONFIGURE_OPTIONS="\
 	--with-quotas \
 	--with-syslog \
 %if 0%{?suse_version} > 1220
+	--enable-avahi \
 	--with-systemd \
 %endif
 	--with-utmp \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 4d0ccde..df939de 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:383f692e69f35e528a544964c13016b91639c53425f657a928376a090d7eb310
-size 54565
+oid sha256:866a645731f364b4ebde5efeadd60801850b306abd4a5570cbabef29f33cb2d3
+size 54529