diff --git a/x11/mxconns/Makefile b/x11/mxconns/Makefile
new file mode 100644
index 00000000000..72e88f0b405
--- /dev/null
+++ b/x11/mxconns/Makefile
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2000/03/17 03:17:02 turan Exp $
+
+DISTNAME=	mxconns-3.1.4
+CATEGORIES=	x11 security
+MASTER_SITES=	http://home.cern.ch/c/cons/www/mxconns/
+
+MAINTAINER=	dbt@meat.net
+
+PERMIT_PACKAGE_CDROM=	"no fee"
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	"no fee"
+PERMIT_DISTFILES_FTP=	Yes
+
+LIB_DEPENDS=    Xm.1:${PORTSDIR}/x11/lesstif
+
+HAS_CONFIGURE=  yes
+EXTRACT_SUFX=   .tgz
+FAKE=Yes
+
+do-install:
+	install -c -o root -g bin -m 555 ${WRKBUILD}/mxconns ${PREFIX}/bin/mxconns
+	install -c -o root -g bin -m 444 ${WRKBUILD}/mxconns.man \
+		${PREFIX}/man/man1/mxconns.1
+
+.include <bsd.port.mk>
diff --git a/x11/mxconns/files/md5 b/x11/mxconns/files/md5
new file mode 100644
index 00000000000..c9cbcf4dc97
--- /dev/null
+++ b/x11/mxconns/files/md5
@@ -0,0 +1,3 @@
+MD5 (mxconns-3.1.4.tgz) = c39611efd4c978d4302538ad65db5f53
+RMD160 (mxconns-3.1.4.tgz) = 1b317972436a4f818ddfdf33b8349c79e7fd2d84
+SHA1 (mxconns-3.1.4.tgz) = 368424e7b5f39cc7667fbb8035ed5352b50ab7dc
diff --git a/x11/mxconns/patches/patch-configure b/x11/mxconns/patches/patch-configure
new file mode 100644
index 00000000000..1fcb43657d8
--- /dev/null
+++ b/x11/mxconns/patches/patch-configure
@@ -0,0 +1,39 @@
+diff -u configure.old configure
+--- configure.old	Tue Jan  4 01:02:50 2000
++++ configure	Mon Feb 28 11:11:30 2000
+@@ -46,6 +46,7 @@
+   OSF1)         os="OSF1";;
+   SunOS)        if [ $rev -ge 5 ]; then os="Solaris"; else os="SunOS"; fi;;
+   ULTRIX)       os="ULTRIX";;
++  OpenBSD)      os="OpenBSD";;
+   *) echo "Sorry, $uname is not yet supported"; exit 1;;
+ esac
+ echo "This seems to be a $os machine..."
+@@ -148,6 +149,27 @@
+ MOTIF_LIB = $xmlib
+ SYS_CFLAGS = -I/usr/X11R6/include
+ SYS_LDFLAGS = $strip-L/usr/X11R6/lib
++SYS_LIBS = -lXext $extra
++EOT
++  unset extra
++fi
++
++#
++# OpenBSD
++#
++if [ "$os" = "OpenBSD" ]; then
++  # everything should be under /usr/X11R6
++  # statically link Motif with explicit library name
++  # Motif could come from Lesstif which could be in /usr/local
++  extra=""
++  if [ -f "/usr/X11R6/lib/libXpm.a" ]; then
++    extra="$extra -lXpm"
++  fi
++  xmlib="-lXm"
++  cat <<EOT >> Makefile.sys
++MOTIF_LIB = $xmlib
++SYS_CFLAGS = -I/usr/X11R6/include -I/usr/local/include
++SYS_LDFLAGS = $strip-L/usr/X11R6/lib -L/usr/local/lib
+ SYS_LIBS = -lXext $extra
+ EOT
+   unset extra
diff --git a/x11/mxconns/pkg/COMMENT b/x11/mxconns/pkg/COMMENT
new file mode 100644
index 00000000000..4a1649735a2
--- /dev/null
+++ b/x11/mxconns/pkg/COMMENT
@@ -0,0 +1 @@
+Interactive X11 proxy with selective X request replacement.
diff --git a/x11/mxconns/pkg/DESCR b/x11/mxconns/pkg/DESCR
new file mode 100644
index 00000000000..1219222d782
--- /dev/null
+++ b/x11/mxconns/pkg/DESCR
@@ -0,0 +1,11 @@
+Mxconns is an X11 proxy that prompts you for individual connections,
+and lets you optionally disable "dangerous" X requests.  Useful
+when logging into a potentially untrusted machine via ssh.
+
+Quick start:
+in your .xsession:
+export XDISPLAY=`mxconns -fork -hunt -verbose -icf "c" -debug "al"`
+later...
+DISPLAY=$XDISPLAY ssh -f <untrusted host> xterm
+
+for more info, read the man page.
diff --git a/x11/mxconns/pkg/PLIST b/x11/mxconns/pkg/PLIST
new file mode 100644
index 00000000000..8bcbb2f19b1
--- /dev/null
+++ b/x11/mxconns/pkg/PLIST
@@ -0,0 +1,2 @@
+bin/mxconns
+man/man1/mxconns.1