diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile
index 1243ebf1f4f9..511a8393c265 100644
--- a/x11/fvwm2/Makefile
+++ b/x11/fvwm2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $NetBSD: Makefile,v 1.2 1997/11/10 00:54:17 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1997/11/10 01:03:10 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp
 #
 
@@ -21,12 +21,11 @@ MAINTAINER=	matusita@jp.freebsd.org
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
-MAN1= 		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
+CAT1= 		FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
 		FvwmButtons.1 FvwmCascade.1 FvwmCpp.1 FvwmForm.1 \
 		FvwmIconBox.1 FvwmIconMan.1 FvwmIdent.1 FvwmM4.1 FvwmPager.1 \
 		FvwmSave.1 FvwmSaveDesk.1 FvwmScroll.1 FvwmTalk.1 FvwmTile.1 \
 		FvwmWinList.1 fvwm2.1 xpmroot.1
-MANCOMPRESSED=	yes
 
 # filenames.
 PATCH_FIXIT=	kits/patch/fix-2.0.46
diff --git a/x11/fvwm2/pkg/PLIST b/x11/fvwm2/pkg/PLIST
index 30c4dd296d6a..754c40966256 100644
--- a/x11/fvwm2/pkg/PLIST
+++ b/x11/fvwm2/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 1997/11/10 01:03:18 hubertf Exp $
 bin/fvwm2
 bin/xpmroot
 lib/X11/fvwm2/FvwmAudio
@@ -151,26 +152,26 @@ lib/X11/fvwm2/pixmaps/xterm-sun.xpm
 lib/X11/fvwm2/pixmaps/xterm.xpm
 lib/X11/fvwm2/pixmaps/xv.xpm
 lib/X11/fvwm2/pixmaps/xv2.xpm
-man/man1/fvwm2.1.gz
-man/man1/xpmroot.1.gz
-man/man1/FvwmAudio.1.gz
-man/man1/FvwmAuto.1.gz
-man/man1/FvwmBacker.1.gz
-man/man1/FvwmBanner.1.gz
-man/man1/FvwmButtons.1.gz
-man/man1/FvwmCascade.1.gz
-man/man1/FvwmCpp.1.gz
-man/man1/FvwmForm.1.gz
-man/man1/FvwmIconBox.1.gz
-man/man1/FvwmIconMan.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmM4.1.gz
-man/man1/FvwmPager.1.gz
-man/man1/FvwmSave.1.gz
-man/man1/FvwmSaveDesk.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmTalk.1.gz
-man/man1/FvwmTile.1.gz
-man/man1/FvwmWinList.1.gz
+man/cat1/fvwm2.0.gz
+man/cat1/xpmroot.0.gz
+man/cat1/FvwmAudio.0.gz
+man/cat1/FvwmAuto.0.gz
+man/cat1/FvwmBacker.0.gz
+man/cat1/FvwmBanner.0.gz
+man/cat1/FvwmButtons.0.gz
+man/cat1/FvwmCascade.0.gz
+man/cat1/FvwmCpp.0.gz
+man/cat1/FvwmForm.0.gz
+man/cat1/FvwmIconBox.0.gz
+man/cat1/FvwmIconMan.0.gz
+man/cat1/FvwmIdent.0.gz
+man/cat1/FvwmM4.0.gz
+man/cat1/FvwmPager.0.gz
+man/cat1/FvwmSave.0.gz
+man/cat1/FvwmSaveDesk.0.gz
+man/cat1/FvwmScroll.0.gz
+man/cat1/FvwmTalk.0.gz
+man/cat1/FvwmTile.0.gz
+man/cat1/FvwmWinList.0.gz
 @dirrm lib/X11/fvwm2/pixmaps
 @dirrm lib/X11/fvwm2