diff --git a/devel/safestr/Makefile b/devel/safestr/Makefile
index 8ca4eb9e0f8a..424c83276531 100644
--- a/devel/safestr/Makefile
+++ b/devel/safestr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	safestr
 PORTVERSION=	1.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.zork.org/software/
 
diff --git a/devel/safestr/files/patch-safefmt.c b/devel/safestr/files/patch-safefmt.c
new file mode 100644
index 000000000000..78e7ae10a9a2
--- /dev/null
+++ b/devel/safestr/files/patch-safefmt.c
@@ -0,0 +1,33 @@
+--- safefmt.c.orig	Mon Sep  4 17:28:27 2006
++++ safefmt.c	Mon Sep  4 18:07:39 2006
+@@ -489,10 +489,10 @@
+         SET_ARGLIST_TYPE(format_arg, type);
+     }
+ 
+-    ap = arglist->ap;
++    va_copy(ap, arglist->ap);
+     for (x = arglist->current;  x < max_arg;  x++)
+         load_argument(x, arglist);
+-    arglist->ap = ap;
++    va_copy(arglist->ap, ap);
+ 
+     arglist->max     = max_arg;
+     arglist->scanned = 1;
+@@ -675,7 +675,7 @@
+     arglist.current = 0;
+     arglist.max     = 0;
+     arglist.scanned = 0;
+-    arglist.ap      = ap;
++    va_copy(arglist.ap, ap);
+     memset(arglist.list, 0, sizeof(arglist.list));
+ 
+     cs_d = 0;
+@@ -683,7 +683,7 @@
+     padding = NULL;
+     *nbytes = padding_size = 0;
+     arglist.current = arglist.max = arglist.scanned = 0;
+-    arglist.ap = ap;
++    va_copy(arglist.ap, ap);
+     trusted = (ifmt->hdr.flags & SAFESTR_TRUSTED) == SAFESTR_TRUSTED;
+ 
+     for (c = start = ifmt->str;  c < ifmt->str + ifmt->hdr.length;  start = ++c)