diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
new file mode 100644
index 00000000000..3d5cfc92434
--- /dev/null
+++ b/emulators/uae/Makefile
@@ -0,0 +1,37 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2002/01/23 20:51:30 fgsch Exp $
+
+COMMENT=	"UAE amiga emulator"
+DISTNAME=	uae-0.8.20
+CATEGORIES=	emulators x11
+NEED_VERSION=	1.480
+
+MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/
+
+HOMEPAGE=	http://www.freiburg.linux.de/~uae
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+USE_X11=		Yes
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--enable-dga --enable-vidmode --disable-ui
+
+DOCS=		COMPATIBILITY CREDITS FAQ NEWS README README.PROGRAMMERS
+
+FILES=		mousehack timehack transdisk transrom uae-control \
+		uae-control.info uae_rcli uaectrl
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/readdisk ${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/uae/amiga
+	cd ${WRKSRC}/docs && ( \
+	  ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/uae; \
+	  ${INSTALL_DATA} unix/README ${PREFIX}/share/uae/README.unix )
+	cd ${WRKSRC}/amiga && ${INSTALL_DATA} ${FILES} \
+	  ${PREFIX}/share/uae/amiga
+
+.include <bsd.port.mk>
diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo
new file mode 100644
index 00000000000..79e730018d4
--- /dev/null
+++ b/emulators/uae/distinfo
@@ -0,0 +1,3 @@
+MD5 (uae-0.8.20.tar.gz) = 50d64862447c8d8fbdd917dac37687b1
+RMD160 (uae-0.8.20.tar.gz) = ada57fbb42c9be33387df732ca92f25f5040b835
+SHA1 (uae-0.8.20.tar.gz) = 5a81e1bcb1fffb7f8e8d94890290a506060684e5
diff --git a/emulators/uae/patches/patch-src_Makefile_in b/emulators/uae/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..d64692a9e75
--- /dev/null
+++ b/emulators/uae/patches/patch-src_Makefile_in
@@ -0,0 +1,47 @@
+Remove gmake dependency.
+
+$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2002/01/23 20:51:30 fgsch Exp $
+--- src/Makefile.in.orig	Mon Nov 19 09:34:18 2001
++++ src/Makefile.in	Sun Jan 13 17:26:03 2002
+@@ -75,7 +75,7 @@ uae: $(OBJS)
+ 	$(CC) $(OBJS) -o uae $(GFXLDFLAGS) $(LDFLAGS) $(DEBUGFLAGS) $(LIBRARIES) $(MATHLIB)
+ 
+ clean:
+-	$(MAKE) -C tools clean
++	cd tools && ${MAKE} clean
+ 	-rm -f $(OBJS) *.o uae readdisk
+ 	-rm -f blit.h cpudefs.c
+ 	-rm -f cpuemu.c build68k cputmp.s cpufast*.s cpustbl.c cputbl.h
+@@ -99,13 +99,13 @@ blittable.c: tools/genblitter blitfunc.h
+ 	./tools/genblitter t >blittable.c
+ 
+ tools/genblitter:
+-	$(MAKE) -C tools genblitter
++	cd tools && ${MAKE} genblitter
+ tools/build68k:
+-	$(MAKE) -C tools build68kc
++	cd tools && ${MAKE} build68kc
+ tools/cpuopti:
+-	$(MAKE) -C tools cpuopti
++	cd tools && ${MAKE} cpuopti
+ tools/gencpu: 
+-	$(MAKE) -C tools gencpu
++	cd tools && ${MAKE} gencpu
+ 
+ custom.o: blit.h
+ drawing.o: linetoscr.c
+@@ -121,12 +121,12 @@ cpustbl.c: cpuemu.c
+ cputbl.h: cpuemu.c
+ 
+ cpufast.s: cpuemu.c tools/cpuopti
+-	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s
++	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) cpuemu.c -o cputmp.s
+ 	./tools/cpuopti <cputmp.s >$@
+ 	rm cputmp.s
+ 
+ console_missing.o: missing.c
+-	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
++	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $? -o $@
+ 
+ osdep/beos.o: osdep/beos.cpp
+ 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) osdep/beos.cpp -o osdep/beos.o
diff --git a/emulators/uae/pkg/DESCR b/emulators/uae/pkg/DESCR
new file mode 100644
index 00000000000..454887aaf00
--- /dev/null
+++ b/emulators/uae/pkg/DESCR
@@ -0,0 +1,8 @@
+UAE allows you to run most of the available Amiga software. It is a
+software emulation, meaning that no extra or special hardware is needed
+to do this. The hardware of an Amiga is emulated accurately, so that Amiga
+software is tricked into thinking it is running on the real thing, with
+your computer's display, keyboard, harddisk and mouse taking the parts of
+their emulated counterparts.
+
+WWW: ${HOMEPAGE}
diff --git a/emulators/uae/pkg/PLIST b/emulators/uae/pkg/PLIST
new file mode 100644
index 00000000000..f1caf78f380
--- /dev/null
+++ b/emulators/uae/pkg/PLIST
@@ -0,0 +1,22 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2002/01/23 20:51:30 fgsch Exp $
+@unexec install-info --delete --info-dir=%D/share/uae/amiga %D/share/uae/amiga/uae-control.info
+bin/readdisk
+bin/uae
+share/uae/COMPATIBILITY
+share/uae/CREDITS
+share/uae/FAQ
+share/uae/NEWS
+share/uae/README
+share/uae/README.PROGRAMMERS
+share/uae/README.unix
+share/uae/amiga/mousehack
+share/uae/amiga/timehack
+share/uae/amiga/transdisk
+share/uae/amiga/transrom
+share/uae/amiga/uae-control
+share/uae/amiga/uae-control.info
+share/uae/amiga/uae_rcli
+share/uae/amiga/uaectrl
+@dirrm share/uae/amiga
+@dirrm share/uae
+@exec install-info --info-dir=%D/share/uae/amiga %D/share/uae/amiga/uae-control.info