diff --git a/apache2-mod_dnssd-apxs2-prefork.patch b/apache2-mod_dnssd-apxs2-prefork.patch
index 2509490..bbdec3a 100644
--- a/apache2-mod_dnssd-apxs2-prefork.patch
+++ b/apache2-mod_dnssd-apxs2-prefork.patch
@@ -1,7 +1,6 @@
-Only in mod_dnssd-0.6.patched/: config.log
-diff -ur mod_dnssd-0.6/configure.ac mod_dnssd-0.6.patched//configure.ac
---- mod_dnssd-0.6/configure.ac	2009-01-28 03:34:21.000000000 +0100
-+++ mod_dnssd-0.6.patched//configure.ac	2009-05-12 17:45:48.000000000 +0200
+diff -ruN mod_dnssd-0.6.orig/configure.ac mod_dnssd-0.6/configure.ac
+--- mod_dnssd-0.6.orig/configure.ac	2009-01-28 03:34:21.000000000 +0100
++++ mod_dnssd-0.6/configure.ac	2011-03-05 14:14:34.000000000 +0100
 @@ -85,8 +85,8 @@
  
  AC_ARG_WITH(apxs,
diff --git a/apache2-mod_dnssd.changes b/apache2-mod_dnssd.changes
index 945e4e7..348c38e 100644
--- a/apache2-mod_dnssd.changes
+++ b/apache2-mod_dnssd.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 20 11:25:36 UTC 2011 - coolo@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Sat Sep 17 11:15:26 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
 -------------------------------------------------------------------
 Tue May 19 17:09:11 CEST 2009 - vuntz@novell.com
 
diff --git a/apache2-mod_dnssd.spec b/apache2-mod_dnssd.spec
index 2414bac..8acd457 100644
--- a/apache2-mod_dnssd.spec
+++ b/apache2-mod_dnssd.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package apache2-mod_dnssd (Version 0.6)
+# spec file for package apache2-mod_dnssd
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2009 Dominique Leuenberger, Almere, The Netherlands.
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,23 +16,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           apache2-mod_dnssd
 %define _name   mod_dnssd
 Summary:        Apache2 module for Zeroconf support via DNS-SD
+License:        Apache-2.0
+Group:          Productivity/Networking/Web/Servers
 Version:        0.6
-Release:        3
+Release:        0
 Source:         %{_name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE apache2-mod_dnssd-apxs2-prefork.patch
 Patch0:         apache2-mod_dnssd-apxs2-prefork.patch
-License:        The Apache Software License
-Group:          Productivity/Networking/Web/Servers
 Url:            http://0pointer.de/lennart/projects/mod_dnssd/
 BuildRequires:  apache2-devel
+BuildRequires:  autoconf
 BuildRequires:  libapr1-devel
-BuildRequires:  libavahi-devel
 BuildRequires:  pkg-config
+%if 0%{?suse_version} > 1020
+BuildRequires:  libavahi-devel
+%else
+BuildRequires:  avahi-devel
+%endif
 Supplements:    packageand(apache2-prefork:gnome-user-share)
 Supplements:    packageand(apache2-worker:gnome-user-share)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,29 +46,20 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 mod_dnssd is an Apache HTTPD module which adds Zeroconf support via
 DNS-SD using Avahi.
 
-
-
-Authors:
---------
-    Lennart Poettering
-
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
 
 %build
 %configure \
-	--disable-lynx
-%__make %{?jobs:-j%jobs}
+	--disable-lynx 
+make %{?_smp_mflags}
 
 %install
 # make install can't work, as apxs -i apparently does not like redirection
 mkdir -p %{buildroot}/%{apache_libexecdir}
 cp -p src/.libs/%{_name}.so %{buildroot}/%{apache_libexecdir}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc README LICENSE
@@ -73,12 +67,3 @@ rm -rf %{buildroot}
 %{apache_libexecdir}/%{_name}.so
 
 %changelog
-* Tue May 19 2009 vuntz@novell.com
-- Add Supplements for gnome-user-share and
-  {apache2-prefork,apache2-worker} since gnome-user-share requires
-  this apache module to have webdav file sharing.
-* Tue May 19 2009 dominique-obs@leuenberger.net
-- Cleanup of the specfile.
-- --disable-lynx to remove the lynx BuildRequires.
-* Tue May 12 2009 dominique-obs@leuenberger.net
--  Initial package during Community Week 1