diff --git a/moe/Makefile b/moe/Makefile
index 6eae600079..0f9420e7de 100644
--- a/moe/Makefile
+++ b/moe/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.18 2015/05/08 20:18:18 gschwarz Exp $
 
-DISTNAME=	moe-1.8
+DISTNAME=	moe-1.9
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=moe/}
 EXTRACT_SUFX=	.tar.lz
@@ -13,7 +13,6 @@ LICENSE=	gnu-gpl-v2
 GNU_CONFIGURE=		YES
 USE_GNU_CONFIGURE_HOST=	NO
 INFO_FILES=		YES
-CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/moe
 MAKE_ENV+=		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
 MAKE_ENV+=		INSTALL_DATA=${INSTALL_DATA:Q}
 MAKE_ENV+=		INSTALL_MAN=${INSTALL_MAN:Q}
@@ -21,6 +20,16 @@ MAKE_ENV+=		INSTALL_DIR=${MKDIR:Q}
 LDFLAGS+=		${BUILDLINK_LDADD.ncurses:Q}
 USE_LANGUAGES=		c++
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+# cf. https://lists.gnu.org/archive/html/bug-moe/2017-09/msg00000.html
+SUBST_CLASSES+= clang
+SUBST_STAGE.clang=	post-patch
+SUBST_FILES.clang=	window_vector.cc
+SUBST_MESSAGE.clang=	fixing code for clang incompatiblity
+SUBST_SED.clang=	-e "s/, 1, /, 1U, /"
+.endif
+
 CONF_FILES=		${PREFIX}/share/examples/moe/moerc \
 			${PKG_SYSCONFDIR}/moerc
 INSTALL_TARGET=		install install-man
diff --git a/moe/distinfo b/moe/distinfo
index 9e6b168c46..c8a997447b 100644
--- a/moe/distinfo
+++ b/moe/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.13 2015/05/08 20:18:18 gschwarz Exp $
 
-SHA1 (moe-1.8.tar.lz) = 1b7c11f09ff8bebe655fb38fb7ab1a8e331e590f
-RMD160 (moe-1.8.tar.lz) = 982a9ffebb4536ce270fd4fabed78a81ec96c47e
-SHA512 (moe-1.8.tar.lz) = c43d76f948bcd8cdd466069a29a7c43b42efdd3c9f890d3479f94e8d75b0cd978085e120d5675ba4a972672991a9f179d4fe7cfb3654c2d424d28c7d9c847019
-Size (moe-1.8.tar.lz) = 79396 bytes
-SHA1 (patch-aa) = eae4344061e7d0ec35fa740c0b7595405ded5577
-SHA1 (patch-ab) = 811e45cf578384ed915d480ea9b04075956e5afb
+SHA1 (moe-1.9.tar.lz) = 6e7f45ccb5796544d415c3bf2206d50f4d8ee646
+RMD160 (moe-1.9.tar.lz) = 004a64d33a3b83cc6ddc28c38e5f01125339539f
+SHA512 (moe-1.9.tar.lz) = 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
+Size (moe-1.9.tar.lz) = 82046 bytes
+SHA1 (patch-aa) = cef5b4e810cb4c6605ae7d4d7e851cd680fb1d18
+SHA1 (patch-ab) = d2f4e0450403dccdd90d5d7f50ff3662c260a23e
diff --git a/moe/patches/patch-aa b/moe/patches/patch-aa
index 95c061e53d..6a42224a86 100644
--- a/moe/patches/patch-aa
+++ b/moe/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.10 2015/05/08 20:18:18 gschwarz Exp $
+$NetBSD$
 
---- Makefile.in.orig	2015-04-21 22:43:12.000000000 +0200
-+++ Makefile.in	2015-05-08 21:52:07.000000000 +0200
+--- Makefile.in.orig	2017-02-14 17:00:19.000000000 +0100
++++ Makefile.in	2020-04-01 21:34:46.000000000 +0200
 @@ -1,11 +1,11 @@
  
  DISTNAME = $(pkgname)-$(pkgversion)
@@ -16,10 +16,10 @@ $NetBSD: patch-aa,v 1.10 2015/05/08 20:18:18 gschwarz Exp $
  LIBS = -lncurses
 -SHELL = /bin/sh
 +#SHELL = /bin/sh
+ CAN_RUN_INSTALLINFO = $(SHELL) -c "install-info --version" > /dev/null 2>&1
  
  edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \
-          encoding.o iso_8859.o menu_file.o menu_help.o menu_opts.o \
-@@ -72,7 +72,7 @@
+@@ -73,7 +73,7 @@
  	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
  	if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi
  	$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.10 2015/05/08 20:18:18 gschwarz Exp $
  
  install-bin-strip : all
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin
-@@ -89,7 +89,7 @@
+@@ -92,7 +92,7 @@
  install-man :
  	if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
  	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"*
diff --git a/moe/patches/patch-ab b/moe/patches/patch-ab
index 5c3a21aa3a..74706f443d 100644
--- a/moe/patches/patch-ab
+++ b/moe/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.7 2015/05/08 20:18:18 gschwarz Exp $
+$NetBSD$
 
---- configure.orig	2015-04-29 00:00:38.000000000 +0200
-+++ configure	2015-05-08 21:48:39.000000000 +0200
+--- configure.orig	2017-06-02 19:25:44.000000000 +0200
++++ configure	2020-04-01 21:30:46.000000000 +0200
 @@ -21,10 +21,10 @@
  infodir='$(datarootdir)/info'
  mandir='$(datarootdir)/man'
@@ -16,4 +16,4 @@ $NetBSD: patch-ab,v 1.7 2015/05/08 20:18:18 gschwarz Exp $
 +#LDFLAGS=
  
  # checking whether we are using GNU C++.
- ${CXX} --version > /dev/null 2>&1
+ /bin/sh -c "${CXX} --version" > /dev/null 2>&1 ||