diff --git a/security/ADMsnmp/Makefile b/security/ADMsnmp/Makefile
index 18bdd5eb4c1..dca41e56b32 100644
--- a/security/ADMsnmp/Makefile
+++ b/security/ADMsnmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		14 Mar 1999
 # Whom:			dugsong@monkey.org
 #
-# $OpenBSD: Makefile,v 1.2 1999/03/23 02:54:06 dugsong Exp $
+# $OpenBSD: Makefile,v 1.3 1999/06/02 02:12:34 dugsong Exp $
 
 PKGNAME=	ADMsnmp-0.1
 DISTNAME=	ADMsnmp.0.1
@@ -25,7 +25,7 @@ do-build:
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/ADMsnmp ${PREFIX}/bin
-		${INSTALL_DATA} ${WRKSRC}/snmp.passwd ${PREFIX}/etc
-		mv ${PREFIX}/etc/snmp.passwd ${PREFIX}/etc/ADMsnmp.passwd
+		${INSTALL_DATA_DIR} ${PREFIX}/lib/ADMsnmp
+		${INSTALL_DATA} ${WRKSRC}/snmp.passwd ${PREFIX}/lib/ADMsnmp
 
 .include <bsd.port.mk>
diff --git a/security/ADMsnmp/patches/patch-aa b/security/ADMsnmp/patches/patch-aa
index 05384cdc175..7cffae2b613 100644
--- a/security/ADMsnmp/patches/patch-aa
+++ b/security/ADMsnmp/patches/patch-aa
@@ -78,7 +78,7 @@
         printf ("cant resolve hostname!\n");
         exit (-1);
       }
-!   opz.wordfile = strdup ("/usr/local/etc/ADMsnmp.passwd");
+!   opz.wordfile = strdup ("/usr/local/lib/ADMsnmp/snmp.passwd");
     opz.outputfile = NULL;
     opz.guess = -1;
     opz.manysend = 2;
diff --git a/security/ADMsnmp/pkg/PLIST b/security/ADMsnmp/pkg/PLIST
index ee0024fc6ed..e60d8418def 100644
--- a/security/ADMsnmp/pkg/PLIST
+++ b/security/ADMsnmp/pkg/PLIST
@@ -1,2 +1,3 @@
 bin/ADMsnmp
-etc/ADMsnmp.passwd
+lib/ADMsnmp/snmp.passwd
+@dirrm lib/ADMsnmp