diff --git a/rygel.changes b/rygel.changes
index cfe0443..99fe3c4 100644
--- a/rygel.changes
+++ b/rygel.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep  7 16:34:48 UTC 2012 - vuntz@opensuse.org
+
+- Add libunistring-devel BuildRequires: this is an optional
+  dependency we missed a while ago, used for collation.
+- Package systemd service file:
+  + Add systemd BuildRequires.
+  + Add %{?systemd_requires}.
+  + Ship rygel.service (taken from git, as it's not in the
+    tarball), and install it as %{_unitdir}/rygel.service.
+  + Add %service_add_{pre,post,preun,postun} calls in scriptlets.
+
 -------------------------------------------------------------------
 Tue Sep  4 11:15:46 UTC 2012 - dimstar@opensuse.org
 
diff --git a/rygel.service b/rygel.service
new file mode 100644
index 0000000..e03c03b
--- /dev/null
+++ b/rygel.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Rygel DLNA server
+After=syslog.target
+
+[Service]
+User=rygel
+Group=rygel
+ExecStart=/usr/bin/rygel
+# ExecStart=/usr/bin/wrap-dbus /usr/bin/rygel
+
+[Install]
+WantedBy=multi-user.target
diff --git a/rygel.spec b/rygel.spec
index 080a6a4..a9bff49 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -24,13 +24,17 @@ License:        LGPL-2.0+
 Group:          Productivity/Multimedia/Other
 Url:            http://live.gnome.org/Rygel
 Source0:        http://download.gnome.org/sources/rygel/0.15/%{name}-%{version}.tar.xz
+# Taken from git, examples/service/systemd/rygel.service
+Source1:        rygel.service
 BuildRequires:  intltool
 BuildRequires:  libgee-devel >= 0.5.2
 BuildRequires:  libgupnp-av-devel >= 0.9.0
 BuildRequires:  libgupnp-devel >= 0.17.1
 BuildRequires:  libsoup-devel
+BuildRequires:  libunistring-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  sqlite3-devel >= 3.5
+BuildRequires:  systemd
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.16.1
@@ -46,6 +50,7 @@ Recommends:     gstreamer-0_10-plugins-bad
 Recommends:     gstreamer-0_10-plugins-good
 Recommends:     gstreamer-0_10-plugins-ugly
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 
 %description
 Rygel is a home media solution that allows you to easily share audio,
@@ -144,6 +149,8 @@ station.
 %prep
 %setup -q
 translation-update-upstream
+# Make sure we have a good reason to ship our copy of rygel.service
+test ! -f examples/service/systemd/rygel.service
 
 %build
 %configure --enable-tracker-plugin \
@@ -155,6 +162,9 @@ make %{?_smp_mflags} V=1
 
 %install
 %make_install
+# test so we know when we can drop the manul installation of the .service file
+test ! -f %{buildroot}%{_unitdir}/rygel.service
+install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/rygel.service
 find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file rygel
 %suse_update_desktop_file rygel-preferences X-SuSE-ControlCenter-System
@@ -163,13 +173,21 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %clean
 rm -rf %{buildroot}
 
+%pre
+%service_add_pre rygel.service
+
 %post
 %desktop_database_post
 %icon_theme_cache_post
+%service_add_post rygel.service
+
+%preun
+%service_del_preun rygel.service
 
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
+%service_del_postun rygel.service
 
 %post -n librygel-core-1_0-0 -p /sbin/ldconfig
 
@@ -187,6 +205,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %doc AUTHORS COPYING README TODO NEWS
 %config(noreplace) %{_sysconfdir}/rygel.conf
+%{_unitdir}/rygel.service
 %{_bindir}/rygel
 %{_bindir}/rygel-preferences
 %{_datadir}/rygel/