diff --git a/moe/DESCR b/moe/DESCR
new file mode 100644
index 0000000000..41512727f4
--- /dev/null
+++ b/moe/DESCR
@@ -0,0 +1,2 @@
+GNU Moe is a powerful, 8-bit clean, text editor for ISO-8859-15 and ASCII
+character encodings.
diff --git a/moe/Makefile b/moe/Makefile
new file mode 100644
index 0000000000..b89fc020e1
--- /dev/null
+++ b/moe/Makefile
@@ -0,0 +1,29 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/11/05 17:56:08 gschwarz Exp $
+
+DISTNAME=	moe-0.5
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_GNU:=moe/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	schwarz@NetBSD.org
+HOMEPAGE=	http://www.gnu.org/software/moe/moe.html
+COMMENT=	Moe Editor - A powerful and user-friendly text editor
+
+GNU_CONFIGURE=	YES
+USE_GNU_CONFIGURE_HOST=	NO
+INFO_FILES=		moe.info
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/moe
+MAKE_ENV+=		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV+=		INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
+USE_LANGUAGES=	c++
+
+CONF_FILES=		${PREFIX}/share/examples/moe/moerc \
+			${PKG_SYSCONFDIR}/moerc
+USE_PKGINSTALL=		YES
+
+INSTALL_TARGET=		install install-man
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 info share/examples/moe
+
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/moe/PLIST b/moe/PLIST
new file mode 100644
index 0000000000..76637e2fa3
--- /dev/null
+++ b/moe/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/11/05 17:56:08 gschwarz Exp $
+bin/moe
+share/examples/moe/moerc
+${PKGMANDIR}/man1/moe.1
+@dirrm share/examples/moe
diff --git a/moe/distinfo b/moe/distinfo
new file mode 100644
index 0000000000..46623e77e6
--- /dev/null
+++ b/moe/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/11/05 17:56:08 gschwarz Exp $
+
+SHA1 (moe-0.5.tar.bz2) = c0d99bb9ae699df3ece64d5b8b5a327fe6b5fa90
+RMD160 (moe-0.5.tar.bz2) = 756a40ed5bc3384bc10a5275b7cbfa3a6b93867c
+Size (moe-0.5.tar.bz2) = 53669 bytes
+SHA1 (patch-aa) = 0b9ed3f286ab88b1fd9dbba0cd90253ca5b95ddf
diff --git a/moe/patches/patch-aa b/moe/patches/patch-aa
new file mode 100644
index 0000000000..52322affcf
--- /dev/null
+++ b/moe/patches/patch-aa
@@ -0,0 +1,51 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/11/05 17:56:08 gschwarz Exp $
+
+--- Makefile.in.orig	2005-10-10 18:07:40.000000000 +0200
++++ Makefile.in	2005-10-15 19:59:05.000000000 +0200
+@@ -1,17 +1,17 @@
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+-rcdir = $(prefix)/etc
++rcdir = $(PKG_SYSCONFDIR)
+ 
+ DISTNAME = moe-0.5
+ 
+-CXX = g++
+-INSTALL = install
+-INSTALL_PROGRAM = $(INSTALL) -p -m 755
+-INSTALL_DATA = $(INSTALL) -p -m 644
+-SHELL = /bin/sh
+-CPPFLAGS =
+-CXXFLAGS = -Wall -W -O2
+-LDFLAGS = -lncurses
++#CXX = g++
++#INSTALL = install
++#INSTALL_PROGRAM = $(INSTALL) -p -m 755
++#INSTALL_DATA = $(INSTALL) -p -m 644
++#SHELL = /bin/sh
++#CPPFLAGS =
++#CXXFLAGS = -Wall -W -O2
++LDFLAGS+= -lncurses
+ 
+ objs = block.o basic_buffer.o buffer.o iso_8859.o main.o \
+        menu_file.o menu_help.o menu_opts.o \
+@@ -52,9 +52,8 @@
+ 
+ install : all install-info
+ 	if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi
+-	if test ! -d $(DESTDIR)$(rcdir) ; then $(INSTALL) -d $(DESTDIR)$(rcdir) ; fi
+ 	$(INSTALL_PROGRAM) ./moe $(DESTDIR)$(bindir)/moe
+-	$(INSTALL_DATA) $(VPATH)/moerc $(DESTDIR)$(rcdir)/moerc
++	$(INSTALL_DATA) $(VPATH)/moerc $(DESTDIR)$(prefix)/share/examples/moe/moerc
+ 
+ install-info :
+ 	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL) -d $(DESTDIR)$(infodir) ; fi
+@@ -63,7 +62,7 @@
+ 
+ install-man :
+ 	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi
+-	$(INSTALL_DATA) $(VPATH)/doc/moe.1 $(DESTDIR)$(mandir)/man1/moe.1
++	$(INSTALL_MAN) $(VPATH)/doc/moe.1 $(DESTDIR)$(mandir)/man1/moe.1
+ 
+ install-strip : all
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install