diff --git a/_service b/_service
deleted file mode 100644
index 5b651a2..0000000
--- a/_service
+++ /dev/null
@@ -1,12 +0,0 @@
-<services>
-  <service name="download_url">
-    <param name="protocol">http</param>
-    <param name="host">tukaani.org</param>
-    <param name="path">/xz/xz-5.0.3.tar.bz2</param>
-  </service>
-  <service name="verify_file">
-    <param name="file">_service:download_url:xz-5.0.3.tar.bz2</param>
-    <param name="verifier">sha256</param>
-    <param name="checksum">5a11b9e17bfcda62319c5a8c4a2062dc81607a316d3f6adff89422d81ec1eae9</param>
-  </service>
-</services>
diff --git a/baselibs.conf b/baselibs.conf
index b991336..d240a68 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,4 @@
 liblzma5
+xz-devel
+	requires -xz-<targettype>
+	requires "liblzma5-<targettype> = <version>"
diff --git a/_service:download_url:xz-5.0.3.tar.bz2 b/xz-5.0.3.tar.bz2
similarity index 100%
rename from _service:download_url:xz-5.0.3.tar.bz2
rename to xz-5.0.3.tar.bz2
diff --git a/xz.changes b/xz.changes
index 0b682c0..69d0f49 100644
--- a/xz.changes
+++ b/xz.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Sep 17 15:19:50 UTC 2011 - coolo@suse.com
+
+- remove _service, too fragile
+
+-------------------------------------------------------------------
+Fri Sep 16 16:37:32 UTC 2011 - jengelh@medozas.de
+
+- Add xz-devel to baselibs
+- Remove redundant sections
+
 -------------------------------------------------------------------
 Tue Jun 14 18:04:53 CEST 2011 - dmueller@suse.de
 
diff --git a/xz.spec b/xz.spec
index 3c3d6da..67bede3 100644
--- a/xz.spec
+++ b/xz.spec
@@ -24,7 +24,7 @@ Release:        2
 Group:          Productivity/Archiving/Compression
 License:        LGPLv2.1+
 Url:            http://tukaani.org/lzma/
-Source:         %{name}-%{version}.tar.bz2
+Source:         http://tukaani.org/xz/%{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkg-config
@@ -107,9 +107,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{__rm} -v %{buildroot}/%{_lib}/liblzma.{so,la}
 %find_lang %{name}
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %post -n liblzma5 -p /sbin/ldconfig
 
 %postun -n liblzma5 -p /sbin/ldconfig