diff --git a/x11/peksystray/Makefile b/x11/peksystray/Makefile
index bb2a66e35ef..32a7aa31de2 100644
--- a/x11/peksystray/Makefile
+++ b/x11/peksystray/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 20:04:23 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2007/10/02 18:35:47 winiger Exp $
 
 COMMENT=		freedesktop.org compliant system tray
 
-DISTNAME=		peksystray-0.3.0
+DISTNAME=		peksystray-0.4.0
 CATEGORIES=		x11
+EXTRACT_SUFX=		.tar.bz2
 
 HOMEPAGE=		http://sourceforge.net/projects/peksystray/
 
-MAINTAINER=		Michael Knudsen <mk@molioner.dk>
+MAINTAINER=		Marc Winiger <winiger@openbsd.org>
 
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -15,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c X11
+WANTLIB=		c X11 ICE SM
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=peksystray/}
 
@@ -23,4 +24,6 @@ SEPARATE_BUILD=		simple
 USE_X11=		Yes
 CONFIGURE_STYLE=	simple
 
+NO_REGRESS=		Yes
+
 .include <bsd.port.mk>
diff --git a/x11/peksystray/distinfo b/x11/peksystray/distinfo
index 230eae474d6..87ca8942d71 100644
--- a/x11/peksystray/distinfo
+++ b/x11/peksystray/distinfo
@@ -1,5 +1,5 @@
-MD5 (peksystray-0.3.0.tar.gz) = dFg1sabxutIVNUNLq5/eOQ==
-RMD160 (peksystray-0.3.0.tar.gz) = MpPKy18ukBiSVWcQBkrICLnHKrY=
-SHA1 (peksystray-0.3.0.tar.gz) = l2rp5zMf4gPrPS8XRPk/bFKJnWU=
-SHA256 (peksystray-0.3.0.tar.gz) = iaH9q+566f3AebCu557K3i1BQ40vQaMh8d9UktbiLuU=
-SIZE (peksystray-0.3.0.tar.gz) = 71344
+MD5 (peksystray-0.4.0.tar.bz2) = c1ohZoTx22W/5xaXRSyvwA==
+RMD160 (peksystray-0.4.0.tar.bz2) = 2lGErpY+zoN1RcsuNzUpAokK3aY=
+SHA1 (peksystray-0.4.0.tar.bz2) = Vg7RkaN8icovHqtoWfFZ7jisxOc=
+SHA256 (peksystray-0.4.0.tar.bz2) = MHM7NJvHkZFxpvoxAjyHBOqukVgISlIQ1JqjIQEjp3g=
+SIZE (peksystray-0.4.0.tar.bz2) = 73810
diff --git a/x11/peksystray/patches/patch-src_Makefile_in b/x11/peksystray/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..fbc75497a97
--- /dev/null
+++ b/x11/peksystray/patches/patch-src_Makefile_in
@@ -0,0 +1,18 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2007/10/02 18:35:47 winiger Exp $
+--- src/Makefile.in.orig	Sat Sep 29 10:43:30 2007
++++ src/Makefile.in	Sat Sep 29 10:44:06 2007
+@@ -143,10 +143,10 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-x_includes = @x_includes@
+-x_libraries = @x_libraries@
+-INCLUDES = @x_includes@
+-peksystray_LDADD = @x_libraries@
++x_includes =
++x_libraries =
++INCLUDES =
++peksystray_LDADD =
+ peksystray_SOURCES = peksystray.c
+ all: all-am
+