diff --git a/sysutils/wmmon/Makefile b/sysutils/wmmon/Makefile
index 143062748ca7..3405ca530a07 100644
--- a/sysutils/wmmon/Makefile
+++ b/sysutils/wmmon/Makefile
@@ -3,13 +3,17 @@
 # Date created:        27 November 1998
 # Whom:                Kris Kennaway <kkennawa@physics.adelaide.edu.au>
 #
-# $Id: Makefile,v 1.1.1.1 1998/12/11 15:22:46 flathill Exp $
+# $Id: Makefile,v 1.2 1998/12/16 04:51:54 flathill Exp $
 #
 
 DISTNAME=	wmmon-1.0b2
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.mezaway.org/pub/
-DISTFILES=	wmmon-1.0b2.tar.gz wmmon-1.0b2-bsd.tar.gz
+MASTER_SITES=	ftp://ftp.mezaway.org/pub/ \
+		http://www.physics.adelaide.edu.au/~kkennawa/ \
+		ftp://ftp.tecnogi.com/pub/linux/WindowMaker/ \
+		ftp://ftp.deva.net/pub/sources/X11/WindowMaker/dockapps/ \
+		ftp://ftp.paco.odessa.ua/.2/x11/wm/WindowMaker/apps/
+DISTFILES=	wmmon-1.0b2.tar.gz wmmon-1.0b2-freebsd.tar.gz
 
 MAINTAINER=	kkennawa@physics.adelaide.edu.au
 
@@ -19,18 +23,24 @@ USE_X_PREFIX=   yes
 
 WRKSRC=		${WRKDIR}/wmmon.app/wmmon
 
-pre-patch:
-	cd ${WRKDIR}/wmmon.app && ${PATCH} -p < ${WRKDIR}/wmmon-freebsd.patch
+.include <bsd.port.pre.mk>
 
-post-extract:
-	${CP} ${WRKDIR}/wmmon/Makefile.FreeBSD ${WRKSRC}/Makefile
+pre-patch:
+	@cd ${WRKDIR}/wmmon.app && ${PATCH} -p < ${WRKDIR}/wmmon-freebsd.patch
+
+post-patch:
+.if ${OSVERSION} >= 300000
+	@${CP} ${WRKDIR}/wmmon/Makefile.FreeBSD-3.0 ${WRKSRC}/Makefile
+.else
+	@${CP} ${WRKDIR}/wmmon/Makefile.FreeBSD-2.2 ${WRKSRC}/Makefile
+.endif
 
 post-install:
-	strip ${PREFIX}/bin/wmmon
+	@strip ${PREFIX}/bin/wmmon
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/wmmon
 	${INSTALL_MAN} ${WRKSRC}/../HINTS ${PREFIX}/share/doc/wmmon
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/wmmon/distinfo b/sysutils/wmmon/distinfo
index 0c9f4ec6420a..a3edfcccab3a 100644
--- a/sysutils/wmmon/distinfo
+++ b/sysutils/wmmon/distinfo
@@ -1,2 +1,2 @@
 MD5 (wmmon-1.0b2.tar.gz) = 1b8c780b8c24a6958c69330fef4171df
-MD5 (wmmon-1.0b2-bsd.tar.gz) = 8da39c1a9ec24c8cf0857c7fa3f8582c
+MD5 (wmmon-1.0b2-freebsd.tar.gz) = 6bb7022610d8834bc4764b0b3f03fee6
diff --git a/sysutils/wmmon/files/patch-aa b/sysutils/wmmon/files/patch-aa
index edfa6ce40531..6241f6f596b1 100644
--- a/sysutils/wmmon/files/patch-aa
+++ b/sysutils/wmmon/files/patch-aa
@@ -1,13 +1,31 @@
-*** Makefile2	Mon Nov 30 21:31:27 1998
---- Makefile	Mon Nov 30 21:34:18 1998
+*** ../../wmmon/Makefile.FreeBSD-3.0~	Thu Nov 12 18:39:57 1998
+--- ../../wmmon/Makefile.FreeBSD-3.0	Fri Jan  1 23:33:27 1999
 ***************
-*** 21,24 ****
+*** 3,9 ****
+  #
+  LIBDIR		= -L/usr/X11R6/lib
+  LIBS		= -lXpm -lXext -lX11 -lkvm -ldevstat
+! CFLAGS		= -g -Wall -I/usr/X11R6/include
+  OBJS		=	wmmon.o \
+  			../wmgeneral/wmgeneral.o \
+  			../wmgeneral/misc.o \
+--- 3,10 ----
+  #
+  LIBDIR		= -L/usr/X11R6/lib
+  LIBS		= -lXpm -lXext -lX11 -lkvm -ldevstat
+! CFLAGS		?= -O2
+! CFLAGS		+= -g -Wall -I/usr/X11R6/include
+  OBJS		=	wmmon.o \
+  			../wmgeneral/wmgeneral.o \
+  			../wmgeneral/misc.o \
+***************
+*** 24,27 ****
   	rm -f $(PROG)
   
   install::
 ! 	install -c -g kmem -m 4755 -o root $(PROG) /usr/X11R6/bin
---- 21,24 ----
+--- 25,28 ----
   	rm -f $(PROG)
   
   install::
-! 	install -c -g kmem -m 4755 -o root $(PROG) $(PREFIX)/bin
+! 	install -c -g kmem -m 4755 -o root $(PROG) ${PREFIX}/bin
diff --git a/sysutils/wmmon/files/patch-ab b/sysutils/wmmon/files/patch-ab
new file mode 100644
index 000000000000..c838e70fba6c
--- /dev/null
+++ b/sysutils/wmmon/files/patch-ab
@@ -0,0 +1,31 @@
+*** ../../wmmon/Makefile.FreeBSD-2.2~	Thu Nov 12 18:39:39 1998
+--- ../../wmmon/Makefile.FreeBSD-2.2	Fri Jan  1 23:34:03 1999
+***************
+*** 3,9 ****
+  #
+  LIBDIR		= -L/usr/X11R6/lib
+  LIBS		= -lXpm -lXext -lX11 -lkvm
+! CFLAGS		= -g -Wall -I/usr/X11R6/include
+  OBJS		=	wmmon.o \
+  			../wmgeneral/wmgeneral.o \
+  			../wmgeneral/misc.o \
+--- 3,10 ----
+  #
+  LIBDIR		= -L/usr/X11R6/lib
+  LIBS		= -lXpm -lXext -lX11 -lkvm
+! CFLAGS		?= -O2
+! CFLAGS		+= -g -Wall -I/usr/X11R6/include
+  OBJS		=	wmmon.o \
+  			../wmgeneral/wmgeneral.o \
+  			../wmgeneral/misc.o \
+***************
+*** 24,27 ****
+  	rm -f $(PROG)
+  
+  install::
+! 	install -c -g kmem -m 4755 -o root $(PROG) /usr/X11R6/bin
+--- 25,28 ----
+  	rm -f $(PROG)
+  
+  install::
+! 	install -c -g kmem -m 4755 -o root $(PROG) ${PREFIX}/bin