diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index 20e152cee23..554b953bbaf 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2006/06/19 19:40:01 jakob Exp $
+# $OpenBSD: Makefile,v 1.8 2006/11/22 10:18:32 jakob Exp $
 
 COMMENT=	"latency logging and graphing system"
 
-VERSION=	2.0.8
+VERSION=	2.0.9
 DISTNAME=	smokeping-${VERSION}
-PKGNAME=	smokeping-${VERSION}p1
+PKGNAME=	smokeping-${VERSION}
 CATEGORIES=	net
 
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
diff --git a/net/smokeping/distinfo b/net/smokeping/distinfo
index 9e8843efe8d..50ded7b2d90 100644
--- a/net/smokeping/distinfo
+++ b/net/smokeping/distinfo
@@ -1,4 +1,4 @@
-MD5 (smokeping-2.0.8.tar.gz) = ad983643ddf04c50eb967a7aac50bf76
-RMD160 (smokeping-2.0.8.tar.gz) = 5f2c969dd7b92c7507d2bb0c73579e175491671e
-SHA1 (smokeping-2.0.8.tar.gz) = 1c96f7c5ee9be1107ec146b5e02021afdec2f5bd
-SIZE (smokeping-2.0.8.tar.gz) = 382530
+MD5 (smokeping-2.0.9.tar.gz) = 512c0bc38176451df7d664050b1283d9
+RMD160 (smokeping-2.0.9.tar.gz) = 3ddbe35f6ec634773d6facc5d7e4c17c17753984
+SHA1 (smokeping-2.0.9.tar.gz) = 89427122eada5fdf5f6145705f080583fb2d245a
+SIZE (smokeping-2.0.9.tar.gz) = 393777
diff --git a/net/smokeping/patches/patch-bin_smokeping_dist b/net/smokeping/patches/patch-bin_smokeping_dist
index 4da5751eb5e..7afee5eda0b 100644
--- a/net/smokeping/patches/patch-bin_smokeping_dist
+++ b/net/smokeping/patches/patch-bin_smokeping_dist
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bin_smokeping_dist,v 1.5 2006/06/14 08:58:22 jakob Exp $
---- bin/smokeping.dist.orig	Fri Apr 14 12:38:39 2006
-+++ bin/smokeping.dist	Tue May 23 15:01:36 2006
+$OpenBSD: patch-bin_smokeping_dist,v 1.6 2006/11/22 10:18:32 jakob Exp $
+--- bin/smokeping.dist.orig	Fri Jul 14 13:17:59 2006
++++ bin/smokeping.dist	Wed Nov 22 11:15:06 2006
 @@ -1,12 +1,17 @@
 -#!/usr/sepp/bin/perl-5.8.4 -w
 +#!/usr/bin/perl -w
@@ -9,15 +9,16 @@ $OpenBSD: patch-bin_smokeping_dist,v 1.5 2006/06/14 08:58:22 jakob Exp $
 -use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
  use lib qw(lib);
  
- use Smokeping 2.000008;
-+use POSIX qw(setuid setgid getpwnam);
+ use Smokeping 2.000009;
+- 
+-Smokeping::main("etc/config.dist");
 +
++use POSIX qw(setuid setgid getpwnam);
 +print "Dropping privileges to _smokeping ...\n";
 +my (undef, undef, $uid, $gid) = POSIX::getpwnam("_smokeping");
 +POSIX::setgid($uid) or die "setgid() to $gid failed, abort\n";
 +POSIX::setuid($uid) or die "setuid() to $uid failed, abort\n";
-  
--Smokeping::main("etc/config.dist");
++
 +Smokeping::main("%%SYSCONFDIR%%/smokeping/config");
  
  =head1 NAME
diff --git a/net/smokeping/patches/patch-htdocs_smokeping_cgi_dist b/net/smokeping/patches/patch-htdocs_smokeping_cgi_dist
index 18cf5cf07f5..b3cd5b50fb2 100644
--- a/net/smokeping/patches/patch-htdocs_smokeping_cgi_dist
+++ b/net/smokeping/patches/patch-htdocs_smokeping_cgi_dist
@@ -1,6 +1,6 @@
-$OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.5 2006/06/14 08:58:22 jakob Exp $
---- htdocs/smokeping.cgi.dist.orig	Fri Apr 14 12:38:39 2006
-+++ htdocs/smokeping.cgi.dist	Tue May 23 14:30:19 2006
+$OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.6 2006/11/22 10:18:32 jakob Exp $
+--- htdocs/smokeping.cgi.dist.orig	Fri Jul 14 13:17:59 2006
++++ htdocs/smokeping.cgi.dist	Wed Nov 22 11:15:40 2006
 @@ -1,13 +1,11 @@
 -#!/usr/sepp/bin/speedy -w
 +#!/usr/local/bin/speedy -w
@@ -10,7 +10,7 @@ $OpenBSD: patch-htdocs_smokeping_cgi_dist,v 1.5 2006/06/14 08:58:22 jakob Exp $
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
  use CGI::Carp qw(fatalsToBrowser);
  
- use Smokeping 2.000008;
+ use Smokeping 2.000009;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("%%SYSCONFDIR%%/smokeping/config");