diff --git a/sysutils/cmdwatch/Makefile b/sysutils/cmdwatch/Makefile
index 99602f158fa3..c3337f634018 100644
--- a/sysutils/cmdwatch/Makefile
+++ b/sysutils/cmdwatch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cmdwatch
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.chruetertee.ch/files/download/
 
diff --git a/sysutils/cmdwatch/files/patch-cmdwatch.c b/sysutils/cmdwatch/files/patch-cmdwatch.c
new file mode 100644
index 000000000000..7daaa8c0795d
--- /dev/null
+++ b/sysutils/cmdwatch/files/patch-cmdwatch.c
@@ -0,0 +1,20 @@
+--- cmdwatch.c.orig	2009-06-04 01:07:21.000000000 -0700
++++ cmdwatch.c	2009-06-04 01:11:52.000000000 -0700
+@@ -163,12 +163,11 @@
+   command_length = strlen(command);
+   for (;optind<argc;optind++)
+     {
+-      int s = strlen(argv[optind]);
+-      char *endp = &command[command_length];
+-      *endp = ' ';
+-      command_length += s + 1;
+-      command = realloc(command, command_length+1);
+-      strcpy(endp+1, argv[optind]);
++      int nlen = command_length + 1 + strlen(argv[optind]);
++      command = realloc(command, nlen + 1);
++      command[command_length] = ' ';
++      strcpy(command + command_length + 1, argv[optind]);
++      command_length = nlen;
+     }
+ 
+   get_terminal_size();