diff --git a/x11/ion/Makefile b/x11/ion/Makefile
new file mode 100644
index 00000000000..8ff03f9b419
--- /dev/null
+++ b/x11/ion/Makefile
@@ -0,0 +1,22 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+
+DISTNAME=	ion-20001229
+HOMEPAGE=	http://www.students.tut.fi/~tuomov/ion/
+
+CATEGORIES=	x11
+NEED_VERSION=	1.340
+MAINTAINER=	Brian Kifiak <bk@rt.fm>
+
+MASTER_SITES=	http://www.students.tut.fi/~tuomov/dl/ \
+		ftp://rt.fm/pub/ion/
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+USE_GMAKE=	Yes
+USE_X11=	Yes
+MAKE_FLAGS=	SYSCONFDIR=${SYSCONFDIR}
+
+.include <bsd.port.mk>
diff --git a/x11/ion/files/md5 b/x11/ion/files/md5
new file mode 100644
index 00000000000..a02f13eb6d8
--- /dev/null
+++ b/x11/ion/files/md5
@@ -0,0 +1,3 @@
+MD5 (ion-20001229.tar.gz) = f254dd104cf5e7962c888f3e175121ed
+RMD160 (ion-20001229.tar.gz) = a6c1301ed41fdda59adb13832519e3790947cfd3
+SHA1 (ion-20001229.tar.gz) = 0269d6a11c670c546acfc81f1cbe05f33f20184c
diff --git a/x11/ion/patches/patch-Makefile b/x11/ion/patches/patch-Makefile
new file mode 100644
index 00000000000..67173c33e67
--- /dev/null
+++ b/x11/ion/patches/patch-Makefile
@@ -0,0 +1,45 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2001/01/02 14:50:36 naddy Exp $
+--- Makefile.orig	Fri Dec 29 18:09:23 2000
++++ Makefile	Sat Dec 30 22:29:23 2000
+@@ -19,7 +19,7 @@ ETC=	etc/bindings-default.conf etc/bindi
+ 	etc/look-brownsteel.conf etc/look-greyviolet.conf \
+ 	etc/look-simpleblue.conf etc/look-wheat.conf etc/sample.conf
+ 
+-DOCS=	README LICENSE ChangeLog doc/config.txt doc/functions.txt
++DOCS=	doc/config.txt doc/functions.txt
+ 
+ ######################################
+ 
+@@ -28,7 +28,7 @@ include rules.mk
+ ######################################
+ 
+ man/ion.1x: man/ion.1x.in
+-	sed 's#PREFIX#$(PREFIX)#g' man/ion.1x.in > man/ion.1x
++	sed -e 's#DOCDIR#$(DOCDIR)#g' -e 's#ETCDIR#$(ETCDIR)#g' man/ion.1x.in > man/ion.1x
+ 
+ _install:
+ 	$(INSTALLDIR) $(BINDIR)
+@@ -44,21 +44,8 @@ _install:
+ 		$(INSTALL) -m $(DATA_MODE) $$i $(DOCDIR)/ion; \
+ 	done
+ 
+-	$(INSTALLDIR) $(ETCDIR)/ion
++	$(INSTALLDIR) $(EXAMPLEDIR)/ion
+ 	for i in $(ETC); do \
+-		$(INSTALL) -m $(DATA_MODE) $$i $(ETCDIR)/ion; \
++		$(INSTALL) -m $(DATA_MODE) $$i $(EXAMPLEDIR)/ion; \
+ 	done
+-
+-	@ if test -f $(ETCDIR)/ion/ion.conf ; then \
+-		echo "$(ETCDIR)/ion/ion.conf already exists. Not installing one."; \
+-	else \
+-		echo "Installing configuration file $(ETCDIR)/ion/ion.conf"; \
+-		if uname -s -p|grep "SunOS sparc" > /dev/null; then \
+-			sed s/bindings-default/bindings-sun/ \
+-			$(ETCDIR)/ion/sample.conf > $(ETCDIR)/ion/ion.conf; \
+-			chmod $(DATA_MODE) $(ETCDIR)/ion/ion.conf; \
+-		else \
+-			cp $(ETCDIR)/ion/sample.conf $(ETCDIR)/ion/ion.conf; \
+-		fi; \
+-	fi
+ 
diff --git a/x11/ion/patches/patch-man_ion_1x_in b/x11/ion/patches/patch-man_ion_1x_in
new file mode 100644
index 00000000000..db723b6d6e6
--- /dev/null
+++ b/x11/ion/patches/patch-man_ion_1x_in
@@ -0,0 +1,44 @@
+$OpenBSD: patch-man_ion_1x_in,v 1.1.1.1 2001/01/02 14:50:36 naddy Exp $
+--- man/ion.1x.in.orig	Thu Dec 21 21:21:23 2000
++++ man/ion.1x.in	Sat Dec 30 17:40:43 2000
+@@ -57,10 +57,10 @@ Call a function (query).
+ Start new SSH session (query, uses ion-ssh).
+ .TP
+ .B F5
+-Open a file for editing (query). Uses ion-edit which by default uses run-mailcap.
++Open a file for editing (query). Uses ion-edit which by default uses vi(1).
+ .TP
+ .B F6
+-Open a file for viewing (query). Uses ion-view which by default uses run-mailcap.
++Open a file for viewing (query). Uses ion-view which by default uses vi(1)/lynx(1).
+ .TP
+ .B F9
+ Goto existing workspace or create new (query).
+@@ -246,13 +246,13 @@ Drag border: resize.
+ 
+ .SH FILES
+ .TP
+-.B PREFIX/etc/ion/ion.conf
++.B ETCDIR/ion/ion.conf
+ System default configuration file
+ .TP
+-.B PREFIX/etc/ion/look-*.conf
++.B ETCDIR/ion/look-*.conf
+ Color scheme configuration files
+ .TP
+-.B PREFIX/etc/ion/bindings-*.conf
++.B ETCDIR/ion/bindings-*.conf
+ Keyboard and pointer binding configuration files
+ .TP
+ .B ~/.ion/ion.conf
+@@ -261,8 +261,8 @@ User default configuration file (overrid
+ .SH SEE ALSO
+ The Ion home page, \fIhttp://www.students.tut.fi/~tuomov/ion/\fP
+ .PP
+-.I PREFIX/doc/ion/
++.I DOCDIR/ion/
+ .PP
+-.I X(1x)
++.I X(1)
+ .SH AUTHOR
+ Ion was written by Tuomo Valkonen <tuomov@cc.tut.fi>.
diff --git a/x11/ion/patches/patch-scripts_ion-edit b/x11/ion/patches/patch-scripts_ion-edit
new file mode 100644
index 00000000000..4fac1bcbe63
--- /dev/null
+++ b/x11/ion/patches/patch-scripts_ion-edit
@@ -0,0 +1,7 @@
+$OpenBSD: patch-scripts_ion-edit,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+--- scripts/ion-edit.orig	Tue Aug 29 00:03:43 2000
++++ scripts/ion-edit	Sat Dec 30 20:18:19 2000
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-exec run-mailcap --action=edit "$1" > /dev/null
++exec ion-runinxterm -T "$1" ${EDITOR-${VISUAL-vi}} "$1"
diff --git a/x11/ion/patches/patch-scripts_ion-view b/x11/ion/patches/patch-scripts_ion-view
new file mode 100644
index 00000000000..ac5215cfe88
--- /dev/null
+++ b/x11/ion/patches/patch-scripts_ion-view
@@ -0,0 +1,14 @@
+$OpenBSD: patch-scripts_ion-view,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+--- scripts/ion-view.orig	Tue Aug 29 00:03:43 2000
++++ scripts/ion-view	Sat Dec 30 22:59:58 2000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+-if echo "$1"|grep -E '^([a-zA-Z]+://|www.)' > /dev/null; then
+-	exec netscape-remote "$1"
++if expr "$1" : '[a-zA-Z][a-zA-Z]*://' > /dev/null; then
++	exec ion-runinxterm -T "$1" lynx "$1"
+ else
+-	exec run-mailcap --action=view "$1" > /dev/null
++	exec ion-runinxterm -T "$1" ${PAGER-less} "$1"
+ fi
+ 
diff --git a/x11/ion/patches/patch-system_mk b/x11/ion/patches/patch-system_mk
new file mode 100644
index 00000000000..ca7e9b66f1a
--- /dev/null
+++ b/x11/ion/patches/patch-system_mk
@@ -0,0 +1,75 @@
+$OpenBSD: patch-system_mk,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+--- system.mk.orig	Thu Dec 28 14:42:07 2000
++++ system.mk	Sat Dec 30 21:33:08 2000
+@@ -7,13 +7,14 @@
+ ## Installation paths
+ ##
+ 
+-PREFIX=/usr/local
++#PREFIX=/usr/local
+ 
+ # No need to modify these usually
+ BINDIR=$(PREFIX)/bin
+-ETCDIR=$(PREFIX)/etc
++ETCDIR=$(SYSCONFDIR)
+ MANDIR=$(PREFIX)/man
+-DOCDIR=$(PREFIX)/doc
++DOCDIR=$(PREFIX)/share/doc
++EXAMPLEDIR=$(PREFIX)/share/examples
+ # Not used
+ INCDIR=$(PREFIX)/include
+ LIBDIR=$(PREFIX)/lib
+@@ -23,7 +24,7 @@ LIBDIR=$(PREFIX)/lib
+ ## X libraries, includes and options
+ ##
+ 
+-X11_PREFIX=/usr/X11R6
++X11_PREFIX=$(X11BASE)
+ 
+ # SunOS/Solaris
+ #X11_PREFIX=/usr/openwin
+@@ -44,14 +45,14 @@ X11_DEFINES=
+ # asprintf and vasprintf in the c library. (gnu libc has.)
+ # If HAS_SYSTEM_ASPRINTF is not defined, an implementation
+ # in sprintf_2.2/ is used.
+-#HAS_SYSTEM_ASPRINTF=1
++HAS_SYSTEM_ASPRINTF=1
+ 
+ 
+ ##
+ ## C compiler
+ ##
+ 
+-CC=gcc
++#CC=gcc
+ 
+ # The POSIX_SOURCE, XOPEN_SOURCE and WARN options should not be necessary,
+ # they're mainly for development use. So, if they cause trouble (not
+@@ -60,7 +61,7 @@ CC=gcc
+ 
+ # libtu/ uses POSIX_SOURCE
+ 
+-POSIX_SOURCE=-ansi -D_POSIX_SOURCE
++#POSIX_SOURCE=-ansi -D_POSIX_SOURCE
+ 
+ # and . (ion) XOPEN_SOURCE.
+ # There is variation among systems what should be used and how they interpret
+@@ -73,13 +74,13 @@ POSIX_SOURCE=-ansi -D_POSIX_SOURCE
+ 
+ # Same as '-Wall -pedantic-errors' without '-Wunused' as callbacks often
+ # have unused variables.
+-WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
+-	-Wtrigraphs -Wformat -Wchar-subscripts \
+-	-Wparentheses -pedantic-errors -Wuninitialized
++#WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
++#	-Wtrigraphs -Wformat -Wchar-subscripts \
++#	-Wparentheses -pedantic-errors -Wuninitialized
+ 
+ 
+-CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+-LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
++CFLAGS+=  $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
++LDFLAGS+= $(LIBS) $(EXTRA_LIBS)
+ 
+ 
+ ##
diff --git a/x11/ion/pkg/COMMENT b/x11/ion/pkg/COMMENT
new file mode 100644
index 00000000000..a9bbc787897
--- /dev/null
+++ b/x11/ion/pkg/COMMENT
@@ -0,0 +1 @@
+light, keyboard friendly window manager
diff --git a/x11/ion/pkg/DEINSTALL b/x11/ion/pkg/DEINSTALL
new file mode 100644
index 00000000000..c3b3871dab2
--- /dev/null
+++ b/x11/ion/pkg/DEINSTALL
@@ -0,0 +1,51 @@
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+#
+# De-installation setup of ion
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=${SYSCONFDIR}/ion
+
+# Function: tell the user what they need to do to delete the port completely
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| these steps as root:"
+    echo "|"
+    echo "|       rm -rf ${CONFIG_DIR}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname DEINSTALL" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    DEINSTALL)
+	if [ -e ${CONFIG_DIR} ]; then
+	    do_notice "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname DEINSTALL" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/x11/ion/pkg/DESCR b/x11/ion/pkg/DESCR
new file mode 100644
index 00000000000..cccc1f0accc
--- /dev/null
+++ b/x11/ion/pkg/DESCR
@@ -0,0 +1,10 @@
+Ion is a new kind of window manager that brings a text-editorish, keyboard
+friendly user interface to window management.
+
+Ion simply divides the screen into frames that take the whole screen. Big
+displays have so much space that this is convenient and smaller displays
+couldn't show more than one window at a time anyway. The frames can be split and
+growing the size of one will shrink others.  As in PWM, clients can be moved
+between frames and multiple clients can be attached to one frame.
+
+WWW: ${HOMEPAGE}
diff --git a/x11/ion/pkg/INSTALL b/x11/ion/pkg/INSTALL
new file mode 100644
index 00000000000..8560af40e94
--- /dev/null
+++ b/x11/ion/pkg/INSTALL
@@ -0,0 +1,71 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+#
+# Pre/post-installation setup of ion
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=${SYSCONFDIR}/ion
+CONFIG_FILE=$CONFIG_DIR/ion.conf
+SAMPLE_CONFIG_DIR=$PREFIX/share/examples/ion
+
+# Function: tell the user what they need to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample files in ${SAMPLE_CONFIG_DIR}"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+# Function: install configuration files
+#
+do_install()
+{
+    install -o root -g wheel -d ${CONFIG_DIR}
+    install -o root -g wheel ${SAMPLE_CONFIG_DIR}/sample.conf ${CONFIG_FILE}
+    perl -i -pe "s#(include\\s+\")([^\"]*\")#\$1$SAMPLE_CONFIG_DIR/\$2#" ${CONFIG_FILE}
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+}
+
+# Verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f ${CONFIG_FILE} ]; then
+	    do_notice "$1"
+	else
+	    do_install "$1"
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/x11/ion/pkg/PLIST b/x11/ion/pkg/PLIST
new file mode 100644
index 00000000000..7bfb5576bf9
--- /dev/null
+++ b/x11/ion/pkg/PLIST
@@ -0,0 +1,20 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2001/01/02 14:50:35 naddy Exp $
+bin/ion
+bin/ion-edit
+bin/ion-man
+bin/ion-runinxterm
+bin/ion-ssh
+bin/ion-view
+man/man1/ion.1x
+share/doc/ion/config.txt
+share/doc/ion/functions.txt
+share/examples/ion/bindings-default.conf
+share/examples/ion/bindings-sun.conf
+share/examples/ion/kludges.conf
+share/examples/ion/look-brownsteel.conf
+share/examples/ion/look-greyviolet.conf
+share/examples/ion/look-simpleblue.conf
+share/examples/ion/look-wheat.conf
+share/examples/ion/sample.conf
+@dirrm share/doc/ion
+@dirrm share/examples/ion