diff --git a/graphics/gii/Makefile b/graphics/gii/Makefile
new file mode 100644
index 00000000000..19ef14e7d7c
--- /dev/null
+++ b/graphics/gii/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 1999/02/01 08:28:48 todd Exp $
+#
+
+DISTNAME=       libgii-0.1
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://sunsite.unc.edu:/pub/ggi/ggi/2_0_beta_1/ \
+		ftp://synergy.caltech.edu:/pub/ggi/ggi/2_0_beta_1/ \
+		ftp://www.us.ggi-project.org:/pub/ggi/ggi/2_0_beta_1/ \
+		ftp://gd.tuwien.ac.at:/graphics/libs/ggi/ggi/2_0_beta_1/ \
+		ftp://ftp.gts.cz:/pub/linux/ggi/ggi/2_0_beta_1/ \
+		ftp://ftp.bero-online.ml.org:/pub/linux/ggi/ggi/2_0_beta_1/ \
+		ftp://ftp.via.ecp.fr:/pub/ggi/ggi/2_0_beta_1/ \
+		ftp://ftp.unina.it:/pub/linux/ggi/ggi/2_0_beta_1/ \
+		ftp://sunsite.icm.edu.pl:/pub/unix/gui/ggi/ggi/2_0_beta_1/ \
+		ftp://ftp.mratnet.com:/pub/ggi/ggi/2_0_beta_1/
+
+MAINTAINER=     todd@openbsd.org
+
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
+.if (${MACHINE_ARCH} != "alpha")
+CONFIGURE_ARGS+=       --enable-shared
+.endif
+CONFIGURE_ARGS+=       --enable-static
+
+docdir=${PREFIX}/share/doc/gii
+
+post-install:
+	${MKDIR} -p ${docdir}
+	${INSTALL_DATA} ${WRKSRC}/README ${docdir}
+	${INSTALL_DATA} ${WRKSRC}/libgii.conf ${docdir}/libgii.conf.example
+
+.include <bsd.port.mk>
diff --git a/graphics/gii/files/md5 b/graphics/gii/files/md5
new file mode 100644
index 00000000000..0f9c0ec604f
--- /dev/null
+++ b/graphics/gii/files/md5
@@ -0,0 +1 @@
+MD5 (libgii-0.1.tar.gz) = e348d7a475bf43c08d1e8cc9db3b7b9e
diff --git a/graphics/gii/pkg/COMMENT b/graphics/gii/pkg/COMMENT
new file mode 100644
index 00000000000..a802e227ae4
--- /dev/null
+++ b/graphics/gii/pkg/COMMENT
@@ -0,0 +1 @@
+General Imput Library (used by libggi).
diff --git a/graphics/gii/pkg/DESCR b/graphics/gii/pkg/DESCR
new file mode 100644
index 00000000000..11736ce7404
--- /dev/null
+++ b/graphics/gii/pkg/DESCR
@@ -0,0 +1,47 @@
+LibGII README
+=============
+
+LibGII (General Input Interface) is intended to be to input what our LibGGI
+(General Graphics Interface) library is to graphics.
+
+The goal of LibGII is to provide a single easy to use, but yet powerful,
+API for all possible input sources. However we are not there yet. The
+API is far from set in stone yet, and is likely to change.
+
+The main purpose of this LibGII release is to accompany our LibGGI beta
+release, but you're still very welcome to use LibGII as a standalone
+library for your non-LibGGI applications. Also you might be interrested in
+the mhub utility found in the demos directory. mhub is a mouse event repeater
+and converter. See mhub(1) and the files doc/env.txt and doc/input.txt for
+more info.
+
+
+How to install and use
+======================
+
+See the files INSTALL and INSTALL.autoconf for installation instructions.
+
+Demos are found in the programs/demos sub directory.  They are built
+automatically.
+
+
+The GGI mailing list
+====================
+
+To subscribe to the GGI mailing list, send a message with the word
+"subscribe" in the Subject: field to ggi-develop-request@eskimo.com
+To unsubscribe from the GGI mailing list, send a message with the word
+"unsubscribe" in the Subject: field to ggi-develop-request@eskimo.com
+
+This is a high volume mailing list with well over 1000 messages a month!
+So be prepared.
+
+
+GGI resources
+=============
+
+Web site: http://www.ggi-project.org/
+FTP site: ftp://ftp.ggi-project.org/pub/ggi
+
+XGGI home: http://www.stacken.kth.se/~mackan/ggi/xggi/
+(XGGI is an X server which runs on LibGGI)
diff --git a/graphics/gii/pkg/PLIST b/graphics/gii/pkg/PLIST
new file mode 100644
index 00000000000..348805ce60b
--- /dev/null
+++ b/graphics/gii/pkg/PLIST
@@ -0,0 +1,76 @@
+@cwd /usr/local/
+@name libgii-0.1
+/usr/local/bin/mhub
+/usr/local/bin/xsendbut
+/usr/local/lib/libgg.so.0.1
+/usr/local/lib/libgg.la
+/usr/local/lib/libgg.a
+/usr/local/lib/libgii.so.0.1
+/usr/local/lib/libgii.la
+/usr/local/lib/libgii.a
+/usr/local/lib/ggi/input/null.so
+/usr/local/lib/ggi/input/null.la
+/usr/local/lib/ggi/input/null.a
+/usr/local/lib/ggi/input/stdin.so
+/usr/local/lib/ggi/input/stdin.la
+/usr/local/lib/ggi/input/stdin.a
+/usr/local/lib/ggi/input/x.so
+/usr/local/lib/ggi/input/x.la
+/usr/local/lib/ggi/input/x.a
+/usr/local/lib/ggi/input/xwin.so
+/usr/local/lib/ggi/input/xwin.la
+/usr/local/lib/ggi/input/xwin.a
+/usr/local/lib/ggi/input/mouse.so
+/usr/local/lib/ggi/input/mouse.la
+/usr/local/lib/ggi/input/mouse.a
+/usr/local/lib/ggi/input/linux_mouse.so
+/usr/local/lib/ggi/input/linux_mouse.la
+/usr/local/lib/ggi/input/linux_mouse.a
+/usr/local/lib/ggi/input/spaceorb.so
+/usr/local/lib/ggi/input/spaceorb.la
+/usr/local/lib/ggi/input/spaceorb.a
+/usr/local/lib/ggi/filter/mouse.so
+/usr/local/lib/ggi/filter/mouse.la
+/usr/local/lib/ggi/filter/mouse.a
+/usr/local/lib/ggi/filter/save.so
+/usr/local/lib/ggi/filter/save.la
+/usr/local/lib/ggi/filter/save.a
+/usr/local/man/man1/mhub.1
+/usr/local/man/man3/giiAddEventMask.3gii
+/usr/local/man/man3/giiClose.3gii
+/usr/local/man/man3/giiEventPoll.3gii
+/usr/local/man/man3/giiEventRead.3gii
+/usr/local/man/man3/giiEventSend.3gii
+/usr/local/man/man3/giiExit.3gii
+/usr/local/man/man3/giiGetEventMask.3gii
+/usr/local/man/man3/giiGetSelectFdset.3gii
+/usr/local/man/man3/giiInit.3gii
+/usr/local/man/man3/giiJoinInputs.3gii
+/usr/local/man/man3/giiOpen.3gii
+/usr/local/man/man3/giiPanic.3gii
+/usr/local/man/man3/giiRemoveEventMask.3gii
+/usr/local/man/man3/giiSetEventMask.3gii
+/usr/local/include/ggi/internal/gii.h
+/usr/local/include/ggi/internal/gii-dl.h
+/usr/local/include/ggi/internal/gii_debug.h
+/usr/local/include/ggi/input/xwin.h
+/usr/local/include/ggi/errors.h
+/usr/local/include/ggi/gg.h
+/usr/local/include/ggi/system.h
+/usr/local/include/ggi/events.h
+/usr/local/include/ggi/keyboard.h
+/usr/local/include/ggi/gii.h
+/usr/local/share/doc/gii/README
+/usr/local/share/doc/gii/libgii.conf.example
+@dirrm /usr/local/share/doc/gii
+@dirrm /usr/local/include/ggi/input
+@dirrm /usr/local/include/ggi/internal
+@dirrm /usr/local/include/ggi
+@dirrm /usr/local/lib/ggi/filter
+@dirrm /usr/local/lib/ggi/input
+@unexec echo "***"
+@unexec echo "*** gii configuation files stored in /etc/ggi have not been"
+@unexec echo "*** removed.  You may wish to remove them manually."
+@unexec echo "***"
+@exec [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -m /usr/local/lib
+@exec [ -f /etc/ggi/libgii.conf ] || cp /usr/local/share/doc/gii/libgii.conf.example /etc/ggi/libgii.conf