diff --git a/drbd.changes b/drbd.changes
index 67aabbc..9066fbf 100644
--- a/drbd.changes
+++ b/drbd.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug 18 18:07:48 CEST 2008 - mrueckert@suse.de
+
+- remove outdated options in the fillup_and_insserv call
+
+-------------------------------------------------------------------
+Mon Aug 18 11:26:43 CEST 2008 - schwab@suse.de
+
+- Fix name of completions file.
+
 -------------------------------------------------------------------
 Tue Jul 15 09:41:31 CEST 2008 - lmb@suse.de
 
diff --git a/drbd.spec b/drbd.spec
index 044eb68..3bdfd2e 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -2,9 +2,16 @@
 # spec file for package drbd (Version 8.2.6)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# 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/
 #
 
@@ -17,7 +24,7 @@ BuildRequires:  xen-tools
 %endif
 Summary:        Distributed Replicated Block Device
 Version:        8.2.6
-Release:        1
+Release:        3
 Source:         %{name}-%{version}.tar.bz2
 Patch0:         drbd-optflags.patch
 License:        GPL v2 or later
@@ -85,6 +92,7 @@ export RPM_BUILD_ROOT
 export CONFIG_BLK_DEV_DRBD=m
 export DIST=suselike
 make PREFIX=%{buildroot}/ install-tools
+mv $RPM_BUILD_ROOT/etc/bash_completion.d/drbdadm{,.sh}
 ln -sf ../etc/init.d/drbd $RPM_BUILD_ROOT/sbin/rcdrbd
 mkdir -p $RPM_BUILD_ROOT/var/lib/drbd
 #
@@ -109,10 +117,10 @@ for flavor in %flavors_to_build; do
 done
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
+rm -rf "$RPM_BUILD_ROOT"
 
 %post
-%{fillup_and_insserv -p}
+%{fillup_and_insserv}
 
 %preun
 %{stop_on_removal}
@@ -123,7 +131,7 @@ done
 %files -n drbd
 %defattr(644, root, root)
 %config(noreplace) /etc/drbd.conf
-/etc/bash_completion.d/drbdadm
+/etc/bash_completion.d/drbdadm.sh
 %defattr(755, root, root)
 /sbin/drbdadm
 /sbin/drbdsetup
@@ -151,6 +159,10 @@ done
 %doc scripts/drbd.conf
 
 %changelog
+* Mon Aug 18 2008 mrueckert@suse.de
+- remove outdated options in the fillup_and_insserv call
+* Mon Aug 18 2008 schwab@suse.de
+- Fix name of completions file.
 * Tue Jul 15 2008 lmb@suse.de
 - Update to 8.2.6 and include all bugfixes from upstream.
 - Fix loading of module (bnc#403731).