diff --git a/avahi-glib2.spec b/avahi-glib2.spec
index af4f15d..2cd8d19 100644
--- a/avahi-glib2.spec
+++ b/avahi-glib2.spec
@@ -85,9 +85,13 @@ PreReq:         sysvinit(network)
 %else
 PreReq:         sysconfig
 %endif
+%{?systemd_requires}
 Recommends:     %{_name}-lang
 BuildRequires:  dbus-1-devel doxygen graphviz python-gdbm zlib-devel
 BuildRequires:  libtool
+%if %suse_version >= 1210
+BuildRequires:  systemd
+%endif
 # For python bindings and utilities:
 #BuildRequires:  dbus-1-python
 #Requires:       dbus-1
@@ -863,21 +867,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%if %suse_version >= 1210
+%service_add_pre avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post
 /sbin/ldconfig
 %{fillup_and_insserv -f -y avahi-daemon}
 %{fillup_and_insserv -f avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_add_post avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_del_preun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %postun
 /sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
 %insserv_cleanup
+%if %suse_version >= 1210
+%service_del_postun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 
diff --git a/avahi-mono.spec b/avahi-mono.spec
index ef97a7d..f1d1d60 100644
--- a/avahi-mono.spec
+++ b/avahi-mono.spec
@@ -85,9 +85,13 @@ PreReq:         sysvinit(network)
 %else
 PreReq:         sysconfig
 %endif
+%{?systemd_requires}
 Recommends:     %{_name}-lang
 BuildRequires:  dbus-1-devel doxygen graphviz python-gdbm zlib-devel
 BuildRequires:  libtool
+%if %suse_version >= 1210
+BuildRequires:  systemd
+%endif
 # For python bindings and utilities:
 #BuildRequires:  dbus-1-python
 #Requires:       dbus-1
@@ -131,39 +135,6 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
 Bonjour conformance test suite. In addition, it supports some nifty
 things, like correct mDNS reflection across LAN segments.
 
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
-This package provides Mono bindings for avahi. Avahi is an
-implementation of the DNS Service Discovery and MulticastDNS
-specifications for Zeroconf Computing. It uses D-BUS for communication
-between user applications and a system daemon. The daemon is used to
-coordinate application efforts in caching replies, necessary to
-minimize the traffic imposed on networks. The Avahi mDNS responder is
-now feature complete, implementing all MUSTs and the majority of the
-SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
-Bonjour conformance test suite. In addition, it supports some nifty
-things, like correct mDNS reflection across LAN segments.
-
 %if %build_core
 
 %package -n libavahi-client3
@@ -730,6 +701,138 @@ SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
 Bonjour conformance test suite. In addition, it supports some nifty
 things, like correct mDNS reflection across LAN segments.
 
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
+This package provides Mono bindings for avahi. Avahi is an
+implementation of the DNS Service Discovery and MulticastDNS
+specifications for Zeroconf Computing. It uses D-BUS for communication
+between user applications and a system daemon. The daemon is used to
+coordinate application efforts in caching replies, necessary to
+minimize the traffic imposed on networks. The Avahi mDNS responder is
+now feature complete, implementing all MUSTs and the majority of the
+SHOULDs of the mDNS and DNS-SD RFCs. It passes all tests in the Apple
+Bonjour conformance test suite. In addition, it supports some nifty
+things, like correct mDNS reflection across LAN segments.
+
 %endif
 %lang_package
 %endif
@@ -928,21 +1031,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%if %suse_version >= 1210
+%service_add_pre avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post
 /sbin/ldconfig
 %{fillup_and_insserv -f -y avahi-daemon}
 %{fillup_and_insserv -f avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_add_post avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_del_preun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %postun
 /sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
 %insserv_cleanup
+%if %suse_version >= 1210
+%service_del_postun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 
diff --git a/avahi-qt4.spec b/avahi-qt4.spec
index 4883e22..982f06b 100644
--- a/avahi-qt4.spec
+++ b/avahi-qt4.spec
@@ -85,9 +85,13 @@ PreReq:         sysvinit(network)
 %else
 PreReq:         sysconfig
 %endif
+%{?systemd_requires}
 Recommends:     %{_name}-lang
 BuildRequires:  dbus-1-devel doxygen graphviz python-gdbm zlib-devel
 BuildRequires:  libtool
+%if %suse_version >= 1210
+BuildRequires:  systemd
+%endif
 # For python bindings and utilities:
 #BuildRequires:  dbus-1-python
 #Requires:       dbus-1
@@ -865,21 +869,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%if %suse_version >= 1210
+%service_add_pre avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post
 /sbin/ldconfig
 %{fillup_and_insserv -f -y avahi-daemon}
 %{fillup_and_insserv -f avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_add_post avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_del_preun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %postun
 /sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
 %insserv_cleanup
+%if %suse_version >= 1210
+%service_del_postun avahi-daemon.service avahi-dnsconfd.service
+%endif
 
 %post -n libavahi-client3 -p /sbin/ldconfig
 
diff --git a/avahi.changes b/avahi.changes
index fa312c1..5d2020c 100644
--- a/avahi.changes
+++ b/avahi.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 10 08:44:41 UTC 2011 - fcrozat@suse.com
+
+- Use systemd macros for 12.1
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:44 UTC 2011 - coolo@suse.com
 
diff --git a/avahi.spec b/avahi.spec
index 48034e5..ede89ba 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -87,9 +87,13 @@ PreReq:         sysvinit(network)
 %else
 PreReq:         sysconfig
 %endif
+%{?systemd_requires}
 Recommends:     %{_name}-lang
 BuildRequires:  dbus-1-devel doxygen graphviz python-gdbm zlib-devel
 BuildRequires:  libtool
+%if %suse_version >= 1210
+BuildRequires:  systemd
+%endif
 # For python bindings and utilities:
 #BuildRequires:  dbus-1-python
 #Requires:       dbus-1
@@ -865,21 +869,33 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/avahi-ui.pc
 %pre
 %{_sbindir}/groupadd -r avahi 2> /dev/null || :
 %{_sbindir}/useradd -r -o -s /bin/false -c "User for Avahi" -d %{_localstatedir}/run/avahi-daemon -g avahi avahi 2> /dev/null || :
+%if %suse_version >= 1210
+%service_add_pre avahi-dnsconfd.service avahi-daemon.service
+%endif
 
 %post
 /sbin/ldconfig
 %{fillup_and_insserv -f -y avahi-daemon}
 %{fillup_and_insserv -f avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_add_post avahi-dnsconfd.service avahi-daemon.service
+%endif
 
 %preun
 %{stop_on_removal avahi-daemon}
 %{stop_on_removal avahi-dnsconfd}
+%if %suse_version >= 1210
+%service_del_preun avahi-dnsconfd.service avahi-daemon.service
+%endif
 
 %postun
 /sbin/ldconfig
 %{restart_on_update avahi-daemon}
 %{restart_on_update avahi-dnsconfd}
 %insserv_cleanup
+%if %suse_version >= 1210
+%service_del_postun avahi-dnsconfd.service avahi-daemon.service
+%endif
 
 %post -n libavahi-client3 -p /sbin/ldconfig