diff --git a/e16keyedit/DESCR b/e16keyedit/DESCR
new file mode 100644
index 0000000000..e24a04cf6f
--- /dev/null
+++ b/e16keyedit/DESCR
@@ -0,0 +1,3 @@
+This is e16keyedit.
+
+This is a standalone keys editor for enlightenment version 0.16.
diff --git a/e16keyedit/Makefile b/e16keyedit/Makefile
new file mode 100644
index 0000000000..6d47fd15a9
--- /dev/null
+++ b/e16keyedit/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1.1.1 2004/08/31 13:45:25 airhead Exp $
+#
+
+DISTNAME=		e16keyedit-0.2
+CATEGORIES=		wm x11
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=enlightenment/}
+
+MAINTAINER=		Peter.Bex@student.kun.nl
+HOMEPAGE=		http://www.enlightenment.org/
+COMMENT=		Keys setup program for Enlightenment
+
+DEPENDS+=		enlightenment-0.16.*:../../wm/enlightenment
+
+USE_LIBTOOL=		YES
+USE_BUILDLINK3=		YES
+USE_X11=		YES
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/e16keyedit ${PREFIX}/bin
+
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/e16keyedit/PLIST b/e16keyedit/PLIST
new file mode 100644
index 0000000000..10db4dfe1e
--- /dev/null
+++ b/e16keyedit/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/31 13:45:25 airhead Exp $
+bin/e16keyedit
diff --git a/e16keyedit/distinfo b/e16keyedit/distinfo
new file mode 100644
index 0000000000..990b5323f6
--- /dev/null
+++ b/e16keyedit/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2004/08/31 13:45:25 airhead Exp $
+
+SHA1 (e16keyedit-0.2.tar.gz) = 6ae901afaaf6d1095c58b7b9cbf7a6d0e1d0ccc8
+Size (e16keyedit-0.2.tar.gz) = 13749 bytes
+SHA1 (patch-aa) = d5c776da74322bda4c33512df07ab014a37888ef
diff --git a/e16keyedit/patches/patch-aa b/e16keyedit/patches/patch-aa
new file mode 100644
index 0000000000..b46221b300
--- /dev/null
+++ b/e16keyedit/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/08/31 13:45:25 airhead Exp $
+
+--- Makefile.orig	2000-03-23 20:04:16.000000000 +0100
++++ Makefile
+@@ -10,17 +10,17 @@ EXTRAS   =
+ BUILD    = \
+ 
+ LIB_DIRS = \
+-    -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
++    -L${PREFIX}/lib -L${X11BASE}/lib -L${X11BASE}/lib
+ LIBS     = \
+-    `gtk-config --libs` -lgdbm -lgdk_imlib
+-CFLAGS   = \
+-    -O -g -D_GNU_SOURCE $(DEVFLAGS)
++    `gtk-config --libs`
++#CFLAGS   = \
++#    -O -g -D_GNU_SOURCE $(DEVFLAGS)
+ #CFLAGS   = \
+ #    -O -g -W -Wall -Wno-unused  -pedantic -pedantic-errors -ansi -D_GNU_SOURCE
+-OPTFLAGS   = \
+-    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
++#OPTFLAGS   = \
++#    -O6 -mpentium -mcpu=pentium -march=pentium -ffast-math -D_GNU_SOURCE
+ INCLUDES = \
+-    `gtk-config --cflags` -I..
++    `gtk-config --cflags` -I.. -I${X11BASE}/include -I${PREFIX}/include
+ 
+ BIN      = e16keyedit
+