diff --git a/emulators/Makefile b/emulators/Makefile
index cfbe2f396738..90b75efb86d7 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -37,6 +37,7 @@
     SUBDIR += fmsx
     SUBDIR += frodo
     SUBDIR += fs-uae
+    SUBDIR += fs-uae-devel
     SUBDIR += fs-uae-launcher
     SUBDIR += fuse
     SUBDIR += fuse-roms
diff --git a/emulators/fs-uae-devel/Makefile b/emulators/fs-uae-devel/Makefile
new file mode 100644
index 000000000000..2e13f2a8aea7
--- /dev/null
+++ b/emulators/fs-uae-devel/Makefile
@@ -0,0 +1,47 @@
+# Created by: Danilo Egea Gondolfo <danilo@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	fs-uae
+PORTVERSION=	2.9.7
+CATEGORIES=	emulators
+PKGNAMESUFFIX=	-devel
+
+MAINTAINER=	johalun0@gmail.com
+COMMENT=	Amiga emulator (development branch)
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+CONFLICTS_INSTALL=	fs-uae-[0-9]*
+
+BUILD_DEPENDS=	zip:archivers/zip
+
+LIB_DEPENDS=	libpng.so:graphics/png \
+		libopenal.so:audio/openal-soft \
+		libmpeg2.so:multimedia/libmpeg2
+
+USES=		desktop-file-utils gettext gl gmake autoreconf \
+		libtool gnome localbase pkgconfig shared-mime-info
+
+USE_SDL=	sdl2
+USE_GL=	gl
+USE_GNOME=	glib20
+USE_XORG=	x11
+
+# Building with GCC gives better emulator performance.
+USE_GCC=	any
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	FrodeSolheim
+GH_PROJECT=	fs-uae
+GH_TAGNAME=	7f4b992
+
+LLD_UNSAFE=	yes
+INSTALLS_ICONS=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-jit
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.mk>
diff --git a/emulators/fs-uae-devel/distinfo b/emulators/fs-uae-devel/distinfo
new file mode 100644
index 000000000000..dc1dddbff77b
--- /dev/null
+++ b/emulators/fs-uae-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1544561226
+SHA256 (FrodeSolheim-fs-uae-2.9.7-7f4b992_GH0.tar.gz) = 18d3cd09478e88c06a6828d961c358da2747d2a2e800b3184c6e34e68080c664
+SIZE (FrodeSolheim-fs-uae-2.9.7-7f4b992_GH0.tar.gz) = 4755344
diff --git a/emulators/fs-uae-devel/pkg-descr b/emulators/fs-uae-devel/pkg-descr
new file mode 100644
index 000000000000..fd1c0697d83e
--- /dev/null
+++ b/emulators/fs-uae-devel/pkg-descr
@@ -0,0 +1,6 @@
+FS-UAE is a free open source Amiga Emulator based on WinUAE.
+FS-UAE emulates A500, A500+, A600, A1200, A1000, A3000
+and A4000 models, but you can tweak the hardware configuration and
+create customized Amigas.
+
+WWW: https://fs-uae.net/
diff --git a/emulators/fs-uae-devel/pkg-plist b/emulators/fs-uae-devel/pkg-plist
new file mode 100644
index 000000000000..e57e2dc6eab4
--- /dev/null
+++ b/emulators/fs-uae-devel/pkg-plist
@@ -0,0 +1,33 @@
+bin/fs-uae
+bin/fs-uae-device-helper
+share/applications/fs-uae.desktop
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/fs-uae.dat
+%%DATADIR%%/share-dir
+share/icons/hicolor/128x128/apps/fs-uae.png
+share/icons/hicolor/16x16/apps/fs-uae.png
+share/icons/hicolor/22x22/apps/fs-uae.png
+share/icons/hicolor/24x24/apps/fs-uae.png
+share/icons/hicolor/256x256/apps/fs-uae.png
+share/icons/hicolor/32x32/apps/fs-uae.png
+share/icons/hicolor/48x48/apps/fs-uae.png
+share/icons/hicolor/64x64/apps/fs-uae.png
+share/locale/cs/LC_MESSAGES/fs-uae.mo
+share/locale/da/LC_MESSAGES/fs-uae.mo
+share/locale/de/LC_MESSAGES/fs-uae.mo
+share/locale/eo/LC_MESSAGES/fs-uae.mo
+share/locale/es/LC_MESSAGES/fs-uae.mo
+share/locale/fi/LC_MESSAGES/fs-uae.mo
+share/locale/fr/LC_MESSAGES/fs-uae.mo
+share/locale/hu/LC_MESSAGES/fs-uae.mo
+share/locale/it/LC_MESSAGES/fs-uae.mo
+share/locale/nb/LC_MESSAGES/fs-uae.mo
+share/locale/nl/LC_MESSAGES/fs-uae.mo
+share/locale/pl/LC_MESSAGES/fs-uae.mo
+share/locale/pt/LC_MESSAGES/fs-uae.mo
+share/locale/pt_BR/LC_MESSAGES/fs-uae.mo
+share/locale/sr/LC_MESSAGES/fs-uae.mo
+share/locale/sv/LC_MESSAGES/fs-uae.mo
+share/locale/tr/LC_MESSAGES/fs-uae.mo
+share/mime/packages/fs-uae.xml
diff --git a/emulators/fs-uae/Makefile b/emulators/fs-uae/Makefile
index 258a871d817a..21cd477f23cf 100644
--- a/emulators/fs-uae/Makefile
+++ b/emulators/fs-uae/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Amiga emulator
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+CONFLICTS_INSTALL=	fs-uae-devel-[0-9]*
+
 BUILD_DEPENDS=	zip:archivers/zip
 
 LIB_DEPENDS=	libpng.so:graphics/png \
@@ -25,6 +27,7 @@ USE_SDL=	sdl2
 USE_GL=		gl
 USE_GNOME=	glib20
 USE_XORG=	x11
+USE_GCC=	any
 
 LLD_UNSAFE=	yes
 INSTALLS_ICONS=	yes