diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index b89313e004c..da66a8b9c0f 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.69 2021/01/08 15:01:14 solene Exp $
+# $OpenBSD: Makefile,v 1.70 2021/01/08 15:53:33 sthen Exp $
 
 COMMENT=	multiple virtual desktop window manager
 
 VERSION=	2.6.9
+REVISION=	0
 DISTNAME=	fvwm-${VERSION}
 PKGNAME=	fvwm2-${VERSION}
 
diff --git a/x11/fvwm2/pkg/PLIST b/x11/fvwm2/pkg/PLIST
index 374f742addc..172e8623048 100644
--- a/x11/fvwm2/pkg/PLIST
+++ b/x11/fvwm2/pkg/PLIST
@@ -1,5 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.17 2021/01/08 15:01:14 solene Exp $
+@comment $OpenBSD: PLIST,v 1.18 2021/01/08 15:53:33 sthen Exp $
+@pkgpath x11/fvwm2,-main
+@pkgpath x11/fvwm2,-fvicons
 @pkgpath x11/fvwm2,-fvwm2
+@conflict fvwm2+fvicons-*
+@conflict fvicons-*
 @bin bin/FvwmCommand
 bin/fvwm-bug
 bin/fvwm-config