diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 73cb7e856d74..17bbdae16fa8 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	efl
 DISTVERSION=	1.25.1
+PORTREVISION=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
@@ -56,7 +57,7 @@ OPTIONS_SINGLE=		CRYPTO ENGINE LUAL
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
 OPTIONS_SINGLE_ENGINE=	OPENGL OPENGLES NONE
 OPTIONS_SINGLE_LUAL=	LUAJIT LUALANG
-OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO EFLONE EXAMPLES GSTREAMER V4L SCIM XIM \
+OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PULSEAUDIO EXAMPLES GSTREAMER V4L SCIM XIM \
 			OPENSSL OPENJPEG PDF PS RAW SVG WEBP XCF OPENGL LUAJIT CXX
 OPTIONS_DEFAULT_aarch64=	LUALANG
 OPTIONS_DEFAULT_powerpc64=	LUALANG
@@ -67,8 +68,8 @@ OPTIONS_EXCLUDE_powerpc64le=	LUAJIT
 OPTIONS_SUB=		yes
 
 HARFBUZZ_DESC=		OpenType text shaping engine
-PHYSICS_DESC=		Physics engine (bullet)
-EFLONE_DESC=		Create EFL-One library (single file library)
+PHYSICS_DESC=		Physics engine (bullet) - DEPRECATED UPSTREAM
+EFLONE_DESC=		Create EFL-One library (single file library) - EXPERIMENTAL
 ELUA_DESC=		Lua launcher binary support in efl
 VNC_DESC=		VNC Server support
 IBUS_DESC=		Intelligent Input Bus
@@ -104,6 +105,7 @@ PHYSICS_MESON_TRUE=		physics
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_MESON_TRUE=		pulseaudio
 
+EFLONE_BROKEN_i386=		EFLONE option is broken on i386 by the upstream bug: https://phab.enlightenment.org/T8870
 EFLONE_MESON_TRUE=		efl-one
 
 ELUA_MESON_TRUE=		elua