diff --git a/accessibility/redshift/Makefile b/accessibility/redshift/Makefile
index ee98d418aaf1..e5c642b37655 100644
--- a/accessibility/redshift/Makefile
+++ b/accessibility/redshift/Makefile
@@ -6,6 +6,10 @@ PORTVERSION=	1.12
 DISTVERSIONPREFIX=	v
 CATEGORIES=	accessibility
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	60f45972a543.patch:-p1 # avoid patch conflict
+PATCHFILES+=	7da875d34854.patch:-p1 # wayland, see #663
+
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Adjusts the color temperature of your screen
 
@@ -15,7 +19,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 USES=		autoreconf:build gettext gmake gnome libtool localbase \
-		pkgconfig shebangfix tar:bzip2 xorg
+		pkgconfig shebangfix tar:bzip2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonls
@@ -26,28 +30,32 @@ SHEBANG_FILES=	src/redshift-gtk/redshift-gtk.in
 
 CONFIGURE_ARGS+=	--disable-wingdi
 
-OPTIONS_DEFINE=	GEO GUI NLS RANDR VIDMODE
-OPTIONS_DEFAULT=GEO RANDR
+OPTIONS_DEFINE=	GEO GUI NLS RANDR VIDMODE WAYLAND
+OPTIONS_DEFAULT=GEO RANDR WAYLAND
 OPTIONS_SUB=	yes
 
 GUI_DESC=	Tray icon
 RANDR_DESC=	Support RANDR for changing colors
 VIDMODE_DESC=	Support VIDMODE for changing colors (NVIDIA)
+WAYLAND_DESC=	Support Wayland (wlroots) for changing colors
 GEO_DESC=	Use geoclue (requires dbus)
 
-USE_XORG+=	x11 xcb
-
 NLS_USES=		iconv
 NLS_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG} \
 			--with-libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_OFF=	--disable-nls
 
-RANDR_USE=		XORG=xrandr
+RANDR_USES=		xorg
+RANDR_USE=		XORG=xcb,xrandr
 RANDR_CONFIGURE_ENABLE=	randr
 
-VIDMODE_USE=		XORG=xxf86vm
+VIDMODE_USES=		xorg
+VIDMODE_USE=		XORG=x11,xxf86vm
 VIDMODE_CONFIGURE_ENABLE=	vidmode
 
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_CONFIGURE_ENABLE=	wayland
+
 GUI_USES=		python:3.6+
 GUI_CONFIGURE_ENABLE=	gui
 GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
diff --git a/accessibility/redshift/distinfo b/accessibility/redshift/distinfo
index 248888e89419..da9377b41be8 100644
--- a/accessibility/redshift/distinfo
+++ b/accessibility/redshift/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1526914198
 SHA256 (jonls-redshift-v1.12_GH0.tar.gz) = dd816df79765f87a0838b1568fbc40c3e8bdb4aef0e77712c85623afe34a29ad
 SIZE (jonls-redshift-v1.12_GH0.tar.gz) = 659019
+SHA256 (60f45972a543.patch) = 93f7c43bc72880408dd64c78588e987924145f0e1324225a70796c24509acaba
+SIZE (60f45972a543.patch) = 2555
+SHA256 (7da875d34854.patch) = 233266921eec951777168ef0d39d64a3c0381133a41d281702f44e716710f8e0
+SIZE (7da875d34854.patch) = 35471
diff --git a/accessibility/redshift/files/patch-src_gamma-wl.c b/accessibility/redshift/files/patch-src_gamma-wl.c
new file mode 100644
index 000000000000..717d37d47154
--- /dev/null
+++ b/accessibility/redshift/files/patch-src_gamma-wl.c
@@ -0,0 +1,14 @@
+gamma-wl.c:24:10: fatal error: 'alloca.h' file not found
+#include <alloca.h>
+         ^~~~~~~~~~
+
+--- src/gamma-wl.c.orig	2019-08-24 15:20:17 UTC
++++ src/gamma-wl.c
+@@ -21,7 +21,6 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <string.h>
+-#include <alloca.h>
+ #include <sys/mman.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>