diff --git a/misc/ttyrec/Makefile b/misc/ttyrec/Makefile
index e3a0d39cec7..313920c3a41 100644
--- a/misc/ttyrec/Makefile
+++ b/misc/ttyrec/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 23:54:17 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2009/03/23 17:42:40 naddy Exp $
 
 COMMENT=	tty recorder
 
 DISTNAME=	ttyrec-1.0.8
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	misc
 
 HOMEPAGE=	http://0xcc.net/ttyrec/
diff --git a/misc/ttyrec/patches/patch-ttyplay_c b/misc/ttyrec/patches/patch-ttyplay_c
new file mode 100644
index 00000000000..ef3c7580027
--- /dev/null
+++ b/misc/ttyrec/patches/patch-ttyplay_c
@@ -0,0 +1,21 @@
+$OpenBSD: patch-ttyplay_c,v 1.1 2009/03/23 17:42:40 naddy Exp $
+--- ttyplay.c.orig	Mon Mar 23 11:32:09 2009
++++ ttyplay.c	Mon Mar 23 11:32:52 2009
+@@ -81,7 +81,7 @@ double
+ ttywait (struct timeval prev, struct timeval cur, double speed)
+ {
+     static struct timeval drift = {0, 0};
+-    struct timeval start;
++    struct timeval start, orig_diff;
+     struct timeval diff = timeval_diff(prev, cur);
+     fd_set readfs;
+ 
+@@ -100,7 +100,7 @@ ttywait (struct timeval prev, struct timeval cur, doub
+      *
+      * Save "diff" since select(2) may overwrite it to {0, 0}. 
+      */
+-    struct timeval orig_diff = diff;
++    orig_diff = diff;
+     select(1, &readfs, NULL, NULL, &diff);
+     diff = orig_diff;  /* Restore the original diff value. */
+     if (FD_ISSET(0, &readfs)) { /* a user hits a character? */