diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index c124e64852f..570553fe5aa 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/12/06 19:06:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/12/07 21:52:03 ajacoutot Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -14,7 +14,7 @@ FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
 
 REVISION-main =		6
-REVISION-server =	4
+REVISION-server =	5
 REVISION-web =		2
 
 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/zabbix/patches/patch-create_data_data_sql b/net/zabbix/patches/patch-create_data_data_sql
index 4c992d8857f..14db6b80abc 100644
--- a/net/zabbix/patches/patch-create_data_data_sql
+++ b/net/zabbix/patches/patch-create_data_data_sql
@@ -1,14 +1,14 @@
-$OpenBSD: patch-create_data_data_sql,v 1.2 2010/01/12 09:04:32 ajacoutot Exp $
---- create/data/data.sql.orig	Wed Apr 22 23:02:19 2009
-+++ create/data/data.sql	Wed Apr 22 23:03:03 2009
+$OpenBSD: patch-create_data_data_sql,v 1.3 2010/12/07 21:52:03 ajacoutot Exp $
+--- create/data/data.sql.orig	Mon Aug 16 10:19:33 2010
++++ create/data/data.sql	Tue Dec  7 22:50:07 2010
 @@ -27,8 +27,8 @@ INSERT INTO config VALUES (1,365,365,600,'1-5,00:00-24
  -- Dumping data for table `scripts`
  --
  
 -INSERT INTO scripts VALUES (1,'Ping','/bin/ping -c 3 {HOST.CONN}',2,0,0);
 -INSERT INTO scripts VALUES (2,'Traceroute','/usr/bin/traceroute {HOST.CONN}',2,0,0);
-+INSERT INTO scripts VALUES (1,'Ping','/sbin/ping -c 3 {HOST.CONN}',2,0,0);
-+INSERT INTO scripts VALUES (2,'Traceroute','/usr/sbin/traceroute {HOST.CONN}',2,0,0);
++INSERT INTO scripts VALUES (1,'Ping','/sbin/ping -c 3 {HOST.CONN} 2>&1',2,0,0);
++INSERT INTO scripts VALUES (2,'Traceroute','/usr/sbin/traceroute {HOST.CONN} 2>&1',2,0,0);
  
  --
  -- Dumping data for table `users`