diff --git a/x11/keynav/Makefile b/x11/keynav/Makefile
new file mode 100644
index 00000000000..688783f6ab6
--- /dev/null
+++ b/x11/keynav/Makefile
@@ -0,0 +1,26 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/06/06 04:44:10 landry Exp $
+
+COMMENT=	turns your keyboard into an fast pointer mover
+
+DISTNAME=	keynav-20080614.01
+CATEGORIES=	x11
+
+HOMEPAGE=	http://www.semicomplete.com/projects/keynav/
+
+# BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	http://semicomplete.googlecode.com/files/
+
+USE_X11=	Yes
+WANTLIB=	X11 Xau Xdmcp Xext Xtst c
+NO_REGRESS=	Yes
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/keynav ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/keynav
+	${INSTALL_DATA} ${WRKSRC}/keynavrc ${PREFIX}/share/examples/keynav/
+.include <bsd.port.mk>
diff --git a/x11/keynav/distinfo b/x11/keynav/distinfo
new file mode 100644
index 00000000000..8115d638996
--- /dev/null
+++ b/x11/keynav/distinfo
@@ -0,0 +1,5 @@
+MD5 (keynav-20080614.01.tar.gz) = PpXZp+9W07xbnA1bG3e0DA==
+RMD160 (keynav-20080614.01.tar.gz) = CZMpxwT7874PvUtA9bZO/L4xl6Y=
+SHA1 (keynav-20080614.01.tar.gz) = OHRoGcJubGxju628dYRmgvviSp8=
+SHA256 (keynav-20080614.01.tar.gz) = con/SPShyRvaXBcA4ukxFHvO9BaEb7mQ+3hmLf0Z2EE=
+SIZE (keynav-20080614.01.tar.gz) = 26300
diff --git a/x11/keynav/patches/patch-Makefile b/x11/keynav/patches/patch-Makefile
new file mode 100644
index 00000000000..152a27695b4
--- /dev/null
+++ b/x11/keynav/patches/patch-Makefile
@@ -0,0 +1,26 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2009/06/06 04:44:10 landry Exp $
+--- Makefile.orig	Fri Jun  5 22:27:03 2009
++++ Makefile	Fri Jun  5 22:31:54 2009
+@@ -1,5 +1,5 @@
+-CFLAGS=`pkg-config --cflags x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
+-LDFLAGS=`pkg-config --libs x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst` 
++CFLAGS+=`pkg-config --cflags x11 xtst 2> /dev/null || echo -I/usr/X11R6/include -I/usr/local/include`
++LDFLAGS+=`pkg-config --libs x11 xtst 2> /dev/null || echo -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXtst` 
+ 
+ #CFLAGS+=-g
+ OTHERFILES=README CHANGELIST COPYRIGHT \
+@@ -13,12 +13,8 @@ clean:
+ 	rm *.o || true;
+ 	make -C xdotool clean || true
+ 
+-keynav: xdo.o keynav.o
+-	gcc $(LDFLAGS) xdo.o keynav.o -o $@
+-
+-xdo.o:
+-	make -C xdotool xdo.o
+-	cp xdotool/xdo.o .
++keynav:
++	${CC} ${CFLAGS} xdotool/xdo.c keynav.c ${LDFLAGS} -o $@
+ 
+ package: clean
+ 	NAME=keynav-`date +%Y%m%d`.$(MICROVERSION); \
diff --git a/x11/keynav/pkg/DESCR b/x11/keynav/pkg/DESCR
new file mode 100644
index 00000000000..b0e53e461a0
--- /dev/null
+++ b/x11/keynav/pkg/DESCR
@@ -0,0 +1,9 @@
+keynav is a piece of an on-going experiment to make pointer-driven
+interfaces easier and faster for users to operate. It lets you move the
+pointer quickly to most points on the screen with only a few key
+strokes.
+You select a piece of the screen. The screen is initially wholely
+selected. One move will cut that region by half. A move is a direction:
+up, down, left, and right.
+Once you're done moving, you simply indicate (with a key stroke) that
+you want to move. Boom, cursor moves.
diff --git a/x11/keynav/pkg/PLIST b/x11/keynav/pkg/PLIST
new file mode 100644
index 00000000000..6d880d8a468
--- /dev/null
+++ b/x11/keynav/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/06 04:44:10 landry Exp $
+@bin bin/keynav
+share/examples/keynav/
+share/examples/keynav/keynavrc