diff --git a/init-suse.diff b/init-suse.diff
index 991051b..bc1460d 100644
--- a/init-suse.diff
+++ b/init-suse.diff
@@ -11,7 +11,7 @@
 +
 +### BEGIN INIT INFO
 +# Provides:          rp-pppoe
-+# Required-Start:    $syslog $network $named
++# Required-Start:    $remote_fs $syslog $network $named
 +# Required-Stop:     $syslog $remote_fs
 +# Default-Start:     3 5
 +# Default-Stop:      0 1 2 6
diff --git a/rp-pppoe.changes b/rp-pppoe.changes
index aa316a0..73a8bf4 100644
--- a/rp-pppoe.changes
+++ b/rp-pppoe.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 22 00:46:26 CET 2008 - crrodriguez@suse.de
+
+- add missing remote_fs dependency in the init script
+- fix/add missing calls to restart_on_update and stop_on_removal macros 
+
 -------------------------------------------------------------------
 Thu Jul 13 14:52:42 CEST 2006 - mskibbe@suse.de
 
diff --git a/rp-pppoe.spec b/rp-pppoe.spec
index 3f9d100..2d992da 100644
--- a/rp-pppoe.spec
+++ b/rp-pppoe.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package rp-pppoe (Version 3.8)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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.
 #
@@ -10,15 +10,16 @@
 
 # norootforbuild
 
+
 Name:           rp-pppoe
 BuildRequires:  ppp
 Summary:        A PPP Over Ethernet Redirector for PPPD
 Version:        3.8
-Release:        1
-License:        GPL
+Release:        89
+License:        GPL v2 or later
 Group:          Productivity/Networking/PPP
 Source:         http://www.roaringpenguin.com/pppoe/rp-pppoe-%{version}.tar.bz2
-URL:            http://www.roaringpenguin.com/pppoe
+Url:            http://www.roaringpenguin.com/pppoe
 Patch0:         init-suse.diff
 Patch1:         docdir.diff
 Patch2:         nonrfc-modems.diff
@@ -61,7 +62,7 @@ Authors:
 %build
 cd src
 CFLAGS=$RPM_OPT_FLAGS \
-./configure --mandir=%{_mandir} --prefix=/usr
+%configure
 make
 cd ../gui
 make
@@ -79,10 +80,14 @@ rm -rf $RPM_BUILD_ROOT/etc/ppp/plugins
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%preun
+%stop_on_removal pppoe
+
 %post
 %{fillup_and_insserv pppoe}
 
-%preun
+%postun
+%restart_on_update pppoe
 %{insserv_cleanup}
 
 %files
@@ -131,8 +136,11 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/tkpppoe/en.msg
 /usr/share/tkpppoe/ja.msg
 
-%changelog -n rp-pppoe
-* Thu Jul 13 2006 - mskibbe@suse.de
+%changelog
+* Fri Feb 22 2008 crrodriguez@suse.de
+- add missing remote_fs dependency in the init script
+- fix/add missing calls to restart_on_update and stop_on_removal macros
+* Thu Jul 13 2006 mskibbe@suse.de
 - update to version 3.8 which
   o Adjusted code and made it possible to disable debugging code
   to shrink size of pppoe executable.
@@ -140,54 +148,54 @@ rm -rf $RPM_BUILD_ROOT
   64-bit machines.
   o Made various functions and variables static that didn't need
   to be visible outside their source files.
-* Fri May 26 2006 - schwab@suse.de
+* Fri May 26 2006 schwab@suse.de
 - Use RPM_OPT_FLAGS.
 - Don't strip binaries.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Nov 17 2005 - arvin@suse.de
+* Thu Nov 17 2005 arvin@suse.de
 - updated to version 3.7
-- pppoe-server prepends "nic-" to interface name if used with
+  - pppoe-server prepends "nic-" to interface name if used with
   kernel-mode plugin
-- added -O option to pppoe-server that specify a different
+  - added -O option to pppoe-server that specify a different
   default options file for pppd
-* Wed Sep 21 2005 - arvin@suse.de
+* Wed Sep 21 2005 arvin@suse.de
 - updated to version 3.6:
-- Changed the names of commands from adsl-* to pppoe-* to
+  - Changed the names of commands from adsl-* to pppoe-* to
   more logically name the scripts (incompatibility)
-- Changed sample firewall scripts to use iptables instead of
+  - Changed sample firewall scripts to use iptables instead of
   the old ipchains command
-* Wed Jan 19 2005 - arvin@suse.de
+* Wed Jan 19 2005 arvin@suse.de
 - fixed build on s390 by compiling without -ansi
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - build as user
-* Fri Sep 05 2003 - ro@suse.de
+* Fri Sep 05 2003 ro@suse.de
 - fix typo in specfile
-* Fri Sep 05 2003 - kukuk@suse.de
+* Fri Sep 05 2003 kukuk@suse.de
 - Add %%attr to get filelist in sync with /etc/permissions*
-* Fri Jun 13 2003 - nashif@suse.de
+* Fri Jun 13 2003 nashif@suse.de
 - Added %%dir to created directories
-* Fri May 16 2003 - nashif@suse.de
+* Fri May 16 2003 nashif@suse.de
 - Fixed init script syntax (bug #26248)
 - Fixed file list
-* Mon Mar 10 2003 - nashif@suse.de
+* Mon Mar 10 2003 nashif@suse.de
 - dont link /etc/resolv.conf, done by ip-up ( #15707)
-* Wed Oct 02 2002 - nashif@suse.de
+* Wed Oct 02 2002 nashif@suse.de
 - Don't check for release file
-* Mon Sep 30 2002 - nashif@suse.de
+* Mon Sep 30 2002 nashif@suse.de
 - fixed bug #20327: wrong path to logger in scripts
-* Mon Aug 19 2002 - kukuk@suse.de
+* Mon Aug 19 2002 kukuk@suse.de
 - fixed compilation on UL
-* Mon Aug 19 2002 - nashif@suse.de
+* Mon Aug 19 2002 nashif@suse.de
 - Fixed bug #17866: Added PreReq
-* Sat Aug 10 2002 - nashif@suse.de
+* Sat Aug 10 2002 nashif@suse.de
 - Fix bug #17465: detect non-rfc modems
 - Fix bug #17466: use netfilter instead of ipchains
-* Mon Jul 29 2002 - nashif@suse.de
+* Mon Jul 29 2002 nashif@suse.de
 - update to 3.5
-* Mon Jan 14 2002 - ro@suse.de
+* Mon Jan 14 2002 ro@suse.de
 - removed START_ADSL
-* Sat Oct 20 2001 - nashif@suse.de
+* Sat Oct 20 2001 nashif@suse.de
 - Update to 3.3
   * Client works on Solaris again.  It was broken in 3.2.
   * Added DEFAULTROUTE=yes|no option to configuration file.
@@ -195,40 +203,40 @@ rm -rf $RPM_BUILD_ROOT
   * Server address pool allows ranges of addresses on a line: a.b.c.d-e
   * Added "-d" (=debug) and "-P" (=check pool file syntax) options to
   pppoe-server.
-* Fri Aug 03 2001 - nashif@suse.de
+* Fri Aug 03 2001 nashif@suse.de
 - Update to version 3.2
-* Thu Jun 28 2001 - nashif@suse.de
+* Thu Jun 28 2001 nashif@suse.de
 - Fixed bug #8966
 - bzipped sources
-* Sat Apr 21 2001 - nashif@suse.de
+* Sat Apr 21 2001 nashif@suse.de
 - Fixed documentation path in GUI
 - Added GUI documentation
-* Thu Apr 05 2001 - nashif@suse.de
+* Thu Apr 05 2001 nashif@suse.de
 - Fixed init script (Use rc_status)
-* Tue Apr 03 2001 - nashif@suse.de
+* Tue Apr 03 2001 nashif@suse.de
 - Update to version 3.0
-* Thu Mar 01 2001 - nashif@suse.de
+* Thu Mar 01 2001 nashif@suse.de
 - Update to version 2.8
 - Fixed headers
-* Fri Dec 22 2000 - nashif@suse.de
+* Fri Dec 22 2000 nashif@suse.de
 - Added obosletes and provides tags
-* Wed Dec 13 2000 - nashif@suse.de
+* Wed Dec 13 2000 nashif@suse.de
 - Update to 2.5 (Fixes security problem)
-* Sat Dec 09 2000 - nashif@suse.de
+* Sat Dec 09 2000 nashif@suse.de
 - Update to 2.4
 - Fix rcadsl link
 - Changed name tp rp-pppoe
-* Wed Nov 29 2000 - nashif@suse.de
+* Wed Nov 29 2000 nashif@suse.de
 - Use insserv
-* Fri Sep 22 2000 - nashif@suse.de
+* Fri Sep 22 2000 nashif@suse.de
 - Updated to 2.3
-* Thu May 25 2000 - nashif@suse.de
+* Thu May 25 2000 nashif@suse.de
 - Updated to 1.9
 - Added init script
-* Sun May 07 2000 - nashif@suse.de
+* Sun May 07 2000 nashif@suse.de
 - Update to version 1.8
-* Wed Mar 29 2000 - nashif@suse.de
+* Wed Mar 29 2000 nashif@suse.de
 - Update to version 1.7
 - Fixed Group & Buildroot tag
-* Wed Feb 23 2000 - nashif@suse.de
+* Wed Feb 23 2000 nashif@suse.de
 - Initial Release (Version 1.3)