diff --git a/pptp-command b/pptp-command
index 8f1b62a..1be66a5 100644
--- a/pptp-command
+++ b/pptp-command
@@ -814,8 +814,9 @@ sub start() {
 # this does the old pptp-stop work
 sub stop() {
 	Rotate $resolv, $resolv_real, $resolv_pptp;
-	print "Sending HUP signal to PPTP processes...\n";
-	`killall -HUP pptp`;
+	print "Sending HUP signal to PPPD processes...\n";
+	# (sb) kill pppd instead of pptp - cleaner interaction with "service"
+	`killall -HUP pppd`;
 	open(LOCK, "<$subsys_dir/pptp") or goto "skip";
 	while(my $r = <LOCK>) {
 		chomp $r;
diff --git a/pptp.changes b/pptp.changes
index 32d31f1..5c3069c 100644
--- a/pptp.changes
+++ b/pptp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 29 15:19:56 CEST 2009 - max@suse.de
+
+- Change 'pptp-command stop' to kill pppd instead of pptp to fix
+  an cleanup tunnel shutdown (bnc#536225).
+
 -------------------------------------------------------------------
 Fri Jul  4 11:20:33 CEST 2008 - hvogel@suse.de
 
diff --git a/pptp.spec b/pptp.spec
index 0fd5f56..56dee73 100644
--- a/pptp.spec
+++ b/pptp.spec
@@ -22,7 +22,7 @@ Name:           pptp
 Url:            http://pptpclient.sourceforge.net/ 
 Summary:        Point-to-Point Tunneling Protocol (PPTP) Client
 Version:        1.7.2
-Release:        23
+Release:        24
 Source:         %{name}-%{version}.tar.bz2
 Source1:        pptp-command
 Source2:        options.pptp
@@ -87,71 +87,3 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) /etc/pptp.d
 
 %changelog
-* Fri Jul 04 2008 hvogel@suse.de
-- update to version 1.7.2
-  * new --test-type and --test-rate options
-  * implement reordering tests to assist with pptpd testing
-  * when we fail to write due to a transient error
-  simply ignore it (treat it as a drop).
-  * add route to PPTP server.  Experimental feature.
-  * include pptpsetup in kit
-  * remove Reference documentation as the license is non-free.
-  * add refuse-pap to default options
-* Thu Nov 02 2006 hvogel@suse.de
-- launder route variable in pptp-command (taint mode) [#214627]
-* Mon Oct 23 2006 hvogel@suse.de
-- update to version 1.7.1
-  * use prctl(2) to set process name
-  * remove superfluous sigset variable and calls
-  * default to not require MPPE
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Mon Aug 01 2005 arvin@suse.de
-- updated to version 1.7.0
-* Tue Mar 15 2005 arvin@suse.de
-- updated to version 1.6.0:
-  - several bug-fixes
-  - add --idle-wait option
-* Mon Aug 09 2004 meissner@suse.de
-- Upgraded to 1.5.0:
-	- fix statistics when buffering disabled [Wilson]
-	- do not inherit the GRE socket [Cameron]
-	- fix a case of non-shutdown of call manager [Klazes]
-	- add --nobuffer option to eliminate all buffering of packets [Wilson]
-	- fix corruption of command line as shown by ps [Howarth]
-	- fix CPU loop after pppd killed [Cameron]
-	- fix compile for ARM architecture [Hopf]
-	- add documentation for command-line options [Wilson]
-	- do not hang when a connection is refused [McCurdy]
-	- better describe a cause of EMSGSIZE [Cameron]
-* Tue Jun 22 2004 arvin@suse.de
-- use new options in options.pptp
-* Mon Mar 01 2004 hmacht@suse.de
-- building as nonroot-user
-- added patch pptp-makefile.patch because of wrong permissions
-* Thu Feb 12 2004 meissner@suse.de
-- Upgraded to 1.4.0:
-	- support options before hostname [Wilson]
-	- defer OCRQ until after SCCRP [Cameron]
-	- include uninstall target [Pieter]
-	- only issue a warning if sync mode is different to pppd [Klazes]
-	- reformat and tidy code [Klazes]
-	- reduce transmitted ack-only packets from 40%% to 0.8%% [Klazes]
-* Wed Jun 11 2003 meissner@suse.de
-- Upgraded to 1.3.1 bugfix release.
-* Wed Jun 11 2003 meissner@suse.de
-- Upgraded to 1.3.0.
-* Mon May 19 2003 meissner@suse.de
-- remove CVS files from install.
-* Tue Feb 18 2003 meissner@suse.de
-- Upgrade to upstream 1.2.0:
-- fix response to dropped packets.
-- fix man page, address must be before options.
-- close stderr to prevent holding open ssh sessions.
-- minor hint added in case of EIO on read() of pty.
-- support synchronous HDLC ppp encoding. Synchronous mode results in an
-  important improvement of the CPU efficiency.
-- handle out-of-order packets arriving on the GRE socket by buffering.
-- bind GRE socket early to prevent ICMP Unreachable response by client.
-* Mon Nov 11 2002 meissner@suse.de
-- initial packaging.