diff --git a/_service b/_service
deleted file mode 100644
index e743699..0000000
--- a/_service
+++ /dev/null
@@ -1,12 +0,0 @@
-<services>
-  <service name="download_url">
-    <param name="protocol">http</param>
-    <param name="host">gupnp.org</param>
-    <param name="path">/sites/all/files/sources/gupnp-igd-0.1.11.tar.gz</param>
-  </service>
-  <service name="recompress">
-    <param name="file">_service:download_url:*.tar.gz</param>
-    <param name="compression">bz2</param>
-  </service>
-  <service name="set_version" />
-</services>
diff --git a/_service:set_version:gupnp-igd.spec b/_service:set_version:gupnp-igd.spec
deleted file mode 100644
index 141ba62..0000000
--- a/_service:set_version:gupnp-igd.spec
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# spec file for package gupnp-igd (Version 0.1.7)
-#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-
-Name:           gupnp-igd
-Version: 0.1.11
-Release: 0
-# FIXME: Check if parallel build works again (broken since 0.1.10)
-Summary:        Library to handle UPnP IGD port mapping
-License:        LGPLv2.1+
-Group:          Development/Libraries/C and C++
-Url:            http://www.gupnp.org/
-Source:         %{name}-%{version}.tar.bz2
-BuildRequires:  gobject-introspection-devel
-BuildRequires:  gtk-doc
-BuildRequires:  libgupnp-devel
-BuildRequires:  python-devel
-BuildRequires:  python-gobject2-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-%description
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
-to have a very simple API.
-
-%package -n libgupnp-igd-1_0-3
-License:        LGPLv2.1+
-Summary:        Library to handle UPnP IGD port mapping
-Group:          Development/Libraries/C and C++
-
-%description -n libgupnp-igd-1_0-3
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
-to have a very simple API.
-
-%package -n python-gupnp-id
-License:        LGPLv2.1+
-Summary:        Library to handle UPnP IGD port mapping - Python Bindings
-Group:          Development/Libraries/Python
-Requires:       libgupnp-igd-1_0-3 = %{version}
-
-%description -n python-gupnp-id
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
-to have a very simple API.
-
-%package -n libgupnp-igd-devel
-License:        LGPLv2.1+
-Summary:        Library to handle UPnP IGD port mapping - Development Files
-Group:          Development/Libraries/C and C++
-Requires:       libgupnp-igd-1_0-3 = %{version}
-Requires:       libgupnp-devel
-
-%description -n libgupnp-igd-devel
-gupnp-igd is a library to handle UPnP IGD port mapping. It is supposed
-to have a very simple API.
-
-%prep
-%setup -q
-
-%build
-%configure --disable-static
-%__make
-
-%install
-%makeinstall
-find %{buildroot} -type f -name "*.la" -delete -print
-
-%clean
-rm -rf %{buildroot}
-
-%post -n libgupnp-igd-1_0-3 -p /sbin/ldconfig
-
-%postun -n libgupnp-igd-1_0-3 -p /sbin/ldconfig
-
-%files -n libgupnp-igd-1_0-3
-%defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README
-%{_libdir}/*.so.*
-%{_libdir}/girepository-1.0/GUPnPIgd-1.0.typelib
-
-%files -n python-gupnp-id
-%defattr(-,root,root)
-%{python_sitearch}/gupnp/
-
-%files -n libgupnp-igd-devel
-%defattr(-,root,root)
-%{_includedir}/%{name}-1.0
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-%{_datadir}/gir-1.0/GUPnPIgd-1.0.gir
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/%{name}
-
-%changelog
diff --git a/_service:recompress:download_url:gupnp-igd-0.1.11.tar.bz2 b/gupnp-igd-0.1.11.tar.bz2
similarity index 100%
rename from _service:recompress:download_url:gupnp-igd-0.1.11.tar.bz2
rename to gupnp-igd-0.1.11.tar.bz2
diff --git a/gupnp-igd.changes b/gupnp-igd.changes
index cd3bea2..1df2490 100644
--- a/gupnp-igd.changes
+++ b/gupnp-igd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun 16 18:28:48 CEST 2011 - dimstar@opensuse.org
+
+- Remove _service usage to follow current factory packaging style.
+
 -------------------------------------------------------------------
 Thu May  5 09:07:28 CEST 2011 - vuntz@opensuse.org
 
diff --git a/gupnp-igd.spec b/gupnp-igd.spec
index 07c61bb..c6027ad 100644
--- a/gupnp-igd.spec
+++ b/gupnp-igd.spec
@@ -18,8 +18,8 @@
 
 
 Name:           gupnp-igd
-Version:        0.1.7
-Release:        3
+Version:        0.1.11
+Release:        1
 # FIXME: Check if parallel build works again (broken since 0.1.10)
 Summary:        Library to handle UPnP IGD port mapping
 License:        LGPLv2.1+