diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index f5ea74a85429..6a65a0fab763 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,52 +1,52 @@
 # New ports collection makefile for: uae
 # Date created: 22 May 2000
 # Whom: Simon Dick <simond@irrelevant.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	uae
 PORTVERSION=	0.8.22
 PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/
 
 MAINTAINER=	simond@irrelevant.org
 COMMENT=	Amiga emulator
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--enable-sound --enable-vidmode --enable-dga
 USE_XLIB=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS}
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/readdisk ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/README ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${PREFIX}/share/uae
-	${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${PREFIX}/share/uae/README.unix
-	@${MKDIR} ${PREFIX}/share/uae/amiga
-	${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/timehack ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/transdisk ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/transrom ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control.info ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${PREFIX}/share/uae/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${PREFIX}/share/uae/amiga/
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/NEWS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${DOCSDIR}/README.unix
+	@${MKDIR} ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/timehack ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/transdisk ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/transrom ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control.info ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${DATADIR}/amiga/
+	${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${DATADIR}/amiga/
 
 .include <bsd.port.mk>
diff --git a/emulators/uae/pkg-plist b/emulators/uae/pkg-plist
index 4955433d4d7f..801681ede05b 100644
--- a/emulators/uae/pkg-plist
+++ b/emulators/uae/pkg-plist
@@ -1,19 +1,20 @@
 bin/uae
 bin/readdisk
-share/uae/COMPATIBILITY
-share/uae/CREDITS
-share/uae/FAQ
-share/uae/NEWS
-share/uae/README
-share/uae/README.unix
-share/uae/README.PROGRAMMERS
-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
+%%DATADIR%%/amiga/mousehack
+%%DATADIR%%/amiga/timehack
+%%DATADIR%%/amiga/transdisk
+%%DATADIR%%/amiga/transrom
+%%DATADIR%%/amiga/uae-control
+%%DATADIR%%/amiga/uae-control.info
+%%DATADIR%%/amiga/uae_rcli
+%%DATADIR%%/amiga/uaectrl
+%%DOCSDIR%%/COMPATIBILITY
+%%DOCSDIR%%/CREDITS
+%%DOCSDIR%%/FAQ
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.PROGRAMMERS
+%%DOCSDIR%%/README.unix
+@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/amiga
+@dirrm %%DATADIR%%