diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index 6fc022714852..ca851f3a1352 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -85,7 +85,7 @@ PHYSICS_CONFIGURE_ENABLE=	physics
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
 
-WAYLAND_BROKEN=			WAYLAND option is broken: https://phab.enlightenment.org/T7116
+WAYLAND_BROKEN=			ERROR: epoll_create() is deprecated, use epoll_create1(EPOLL_CLOEXEC).
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.7:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=		libepoll-shim.so:devel/libepoll-shim \
 				libxkbcommon.so:x11/libxkbcommon \
diff --git a/devel/libepoll-shim/Makefile b/devel/libepoll-shim/Makefile
index 20ef0d4a39e6..c80ab0521cc8 100644
--- a/devel/libepoll-shim/Makefile
+++ b/devel/libepoll-shim/Makefile
@@ -3,8 +3,12 @@
 
 PORTNAME=	libepoll-shim
 PORTVERSION=	0.0.20161220
+PORTREVISION=	1
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	dbd89815cc3a.patch:-p1 dc10c10f11d6.patch:-p1
+
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	epoll shim implemented using kevent
 
@@ -26,7 +30,7 @@ MAKE_ARGS=	INCSDIR=${PREFIX}/include/libepoll-shim/sys \
 post-patch:
 .if "${CHOSEN_COMPILER_TYPE}" == "gcc"
 	@${REINPLACE_CMD} -e 's|Wno-missing-variable-declarations|Wno-missing-declarations|' \
-		-e 's|-Wno-thread-safety-analysis||' -e 's|Weverything|Wall|' ${WRKSRC}/Makefile
+		-e 's|-Wno-thread-safety-analysis||' ${WRKSRC}/Makefile
 .endif
 
 pre-install:
diff --git a/devel/libepoll-shim/distinfo b/devel/libepoll-shim/distinfo
index 14540e447ef8..10289ac97925 100644
--- a/devel/libepoll-shim/distinfo
+++ b/devel/libepoll-shim/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1482268996
 SHA256 (FreeBSDDesktop-epoll-shim-0.0.20161220-c04b26b_GH0.tar.gz) = ae644d6b21567e9bb5e3a145e6e8ce233de16dc6c93ca4a1facb24f1375f442a
 SIZE (FreeBSDDesktop-epoll-shim-0.0.20161220-c04b26b_GH0.tar.gz) = 7634
+SHA256 (dbd89815cc3a.patch) = acd75a9305d5465e8f7a6a5cc7cfa4fe41dac90a69120639ed1e25dd071fc0c3
+SIZE (dbd89815cc3a.patch) = 958
+SHA256 (dc10c10f11d6.patch) = 65e4c048236aafb1c1807a82cb85aa1ced225af5f13a31c54d1154888a75e0f5
+SIZE (dc10c10f11d6.patch) = 870