diff --git a/sysmon/Makefile b/sysmon/Makefile
index ff445e1b33..c97e2f7041 100644
--- a/sysmon/Makefile
+++ b/sysmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/03/08 00:46:33 pettai Exp $
+# $NetBSD: Makefile,v 1.4 2009/12/13 14:07:02 pettai Exp $
 #
 
 DISTNAME=		sysmon-0.92.2
@@ -23,8 +23,13 @@ SMDOC=			${PREFIX}/share/doc/sysmon
 CONF_FILES=		${EGDIR}/sysmon.conf.dist \
 			${PKG_SYSCONFDIR}/sysmon.conf
 
+SUBST_CLASSES+=         paths
+SUBST_FILES.paths=      ${WRKSRC}/autoconf/Makefile.in
+SUBST_STAGE.paths=      post-patch
+SUBST_SED.paths=        -e 's,@destdir@,${DESTDIR},g'
+
 INSTALLATION_DIRS=      share/examples/sysmon
-INSTALLATION_DIRS+=     share/doc/sysmon bin
+INSTALLATION_DIRS+=     share/doc/sysmon bin man/man5 man/man8
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/examples/sysmon.conf.dist ${DESTDIR}${EGDIR}/sysmon.conf.dist
diff --git a/sysmon/distinfo b/sysmon/distinfo
index d987c75e3a..fb051c3c0b 100644
--- a/sysmon/distinfo
+++ b/sysmon/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/09/02 20:25:40 pettai Exp $
+$NetBSD: distinfo,v 1.2 2009/12/13 14:07:02 pettai Exp $
 
 SHA1 (sysmon-0.92.2.tar.gz) = 6853adcc359e5132893fc347723e58829ae7132a
 RMD160 (sysmon-0.92.2.tar.gz) = 7408bfa9a20482e2f0e86dee2566b175b8ecad59
 Size (sysmon-0.92.2.tar.gz) = 495714 bytes
+SHA1 (patch-aa) = ec5ac4a213cdcd1a79f87c7a89b6c687a3b19b56
diff --git a/sysmon/patches/patch-aa b/sysmon/patches/patch-aa
new file mode 100644
index 0000000000..c871957662
--- /dev/null
+++ b/sysmon/patches/patch-aa
@@ -0,0 +1,33 @@
+$NetBSD: patch-aa,v 1.1 2009/12/13 14:07:02 pettai Exp $
+
+--- autoconf/Makefile.in.orig	2009-12-13 14:50:15.000000000 +0100
++++ autoconf/Makefile.in	2009-12-13 14:52:57.000000000 +0100
+@@ -19,6 +19,7 @@
+ LDFLAGS         = @LDFLAGS@
+ RM		= /bin/rm -f
+ 
++destdir = @destdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
+@@ -54,13 +55,13 @@
+ 	grep SYSM_VERS config.h | mail -s"Sysmon Registration" jared@puck.nether.net
+ 
+ install:	all
+-	@echo "installing into @bindir@"
+-	-mkdir -p @bindir@
+-	-mv @bindir@/sysmond @bindir@/sysmond.old
+-	-mv @bindir@/sysmon @bindir@/sysmon.old
+-	cp sysmon sysmond @bindir@
+-	@echo "creating directory @sysconfdir@"
+-	-mkdir -p @sysconfdir@
++	@echo "installing into @destdir@/@bindir@"
++	-mkdir -p @destdir@/@bindir@
++	-mv @destdir@/@bindir@/sysmond @destdir@/@bindir@/sysmond.old
++	-mv @destdir@/@bindir@/sysmon @destdir@/@bindir@/sysmon.old
++	cp sysmon sysmond @destdir@/@bindir@
++	@echo "creating directory @destdir@/@sysconfdir@"
++	-mkdir -p @destdir@/@sysconfdir@
+ 
+ strip:
+ 	-strip @PROGS@