diff --git a/dhcp.changes b/dhcp.changes
index 5cc9d8b..d734575 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 12 08:39:03 UTC 2011 - mt@suse.de
+
+- Removed obsolete sles8 compatibility dependencies, fixed
+  to avoid non-functional sles_version conditionals.
+
 -------------------------------------------------------------------
 Tue May 10 11:48:57 UTC 2011 - mt@suse.de
 
diff --git a/dhcp.spec b/dhcp.spec
index f79510b..4384357 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -21,9 +21,12 @@
 %define susefw2dir    %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %define omc_prefix    /usr/share/omc
 %define omc_svcdir    %{omc_prefix}/svcinfo.d
-%define with_ldap     1
-%define with_ldapcasa 0%{?sles_version} > 0
-%define with_doc_package !0%{?sles_version}
+# always on
+%define with_ldap         1
+# on sles, but sles_version is gone
+%define with_ldapcasa     0%{?sles_version} >= 10 || (%suse_version >= 1110 && %suse_version < 1140)
+# doc package is new on 11.3
+%define with_doc_package  %suse_version >= 1130
 
 Name:           dhcp
 %if %{with_ldap}
@@ -87,8 +90,8 @@ Patch45:        dhcp-4.2.1-P1-dhclient-option-checks.bnc675052.diff
 ##
 PreReq:         /bin/touch /sbin/chkconfig sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Provides:       dhcp = %{version} dhcp-base:/usr/bin/omshell
-Obsoletes:      dhcp < %{version} dhcp-base
+Provides:       dhcp = %{version}
+Obsoletes:      dhcp < %{version}
 
 %package server
 License:        BSD3c(or similar)
@@ -96,7 +99,7 @@ Summary:        ISC DHCP Server
 Group:          Productivity/Networking/Boot/Servers
 Requires:       net-tools dhcp = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /bin/cat /bin/mkdir /bin/cp /usr/sbin/useradd
-Provides:       dhcp-server = %{version}, dhcp_server, dhcp_server6, dhcp:/usr/sbin/dhcpd
+Provides:       dhcp-server = %{version}, dhcp_server, dhcp_server6
 Obsoletes:      dhcp-server < %{version}
 AutoReqProv:    on