diff --git a/x11/x2x/Makefile b/x11/x2x/Makefile
new file mode 100644
index 00000000000..5fa1390be7d
--- /dev/null
+++ b/x11/x2x/Makefile
@@ -0,0 +1,21 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1999/03/01 10:39:00 todd Exp $
+#
+
+# 
+# What port/package will be created
+#
+DISTNAME=		x2x-1.27
+CATEGORIES=     	x11
+
+MAINTAINER=		todd@openbsd.org
+
+MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/SRC/x2x/ \
+		ftp://ftp.digital.de/Digital/SRC/x2x/ \
+		ftp://ftp.europe.digital.com/pub/DEC/SRC/x2x/
+
+USE_IMAKE=		yes
+
+pre-build:
+	@nroff -man ${WRKSRC}/x2x.1 > ${WRKSRC}/x2x.man 2> /dev/null
+
+.include <bsd.port.mk>
diff --git a/x11/x2x/files/md5 b/x11/x2x/files/md5
new file mode 100644
index 00000000000..feb4a72c062
--- /dev/null
+++ b/x11/x2x/files/md5
@@ -0,0 +1 @@
+MD5 (x2x-1.27.tar.gz) = 3d1bc863f3209ec37caf7f57bde7e8f0
diff --git a/x11/x2x/pkg/COMMENT b/x11/x2x/pkg/COMMENT
new file mode 100644
index 00000000000..909e0d89162
--- /dev/null
+++ b/x11/x2x/pkg/COMMENT
@@ -0,0 +1 @@
+One keyboard and/or mouse, multiple X displays.
diff --git a/x11/x2x/pkg/DESCR b/x11/x2x/pkg/DESCR
new file mode 100644
index 00000000000..dc9252aeb28
--- /dev/null
+++ b/x11/x2x/pkg/DESCR
@@ -0,0 +1,5 @@
+x2x  allows  the keyboard and mouse on one ("from") X dis-
+play to be used  to  control  another  ("to")  X  display.
+Since  x2x  uses  the  XTEST extension, the "to" X display
+must support XTEST.
+
diff --git a/x11/x2x/pkg/PLIST b/x11/x2x/pkg/PLIST
new file mode 100644
index 00000000000..aefd4d92560
--- /dev/null
+++ b/x11/x2x/pkg/PLIST
@@ -0,0 +1,4 @@
+@cwd /usr/X11R6
+@name x2x-1.27
+bin/x2x
+man/cat1/x2x.0