diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index 105ac01c6c8..0ceb906eb6e 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,6 +1,4 @@
-# 
-# $OpenBSD: Makefile,v 1.12 2000/06/27 06:36:10 jakob Exp $
-# 
+# $OpenBSD: Makefile,v 1.13 2000/06/29 21:20:03 jakob Exp $
 
 DISTNAME=		ucd-snmp-4.1.2
 CATEGORIES=     	net
diff --git a/net/ucd-snmp/patches/patch-ab b/net/ucd-snmp/patches/patch-Makefile_in
similarity index 73%
rename from net/ucd-snmp/patches/patch-ab
rename to net/ucd-snmp/patches/patch-Makefile_in
index b85b41e3064..fc136da040f 100644
--- a/net/ucd-snmp/patches/patch-ab
+++ b/net/ucd-snmp/patches/patch-Makefile_in
@@ -1,5 +1,6 @@
---- Makefile.in.orig	Tue May 30 12:19:19 2000
-+++ Makefile.in	Tue May 30 12:19:31 2000
+$OpenBSD: patch-Makefile_in,v 1.1 2000/06/29 21:20:04 jakob Exp $
+--- Makefile.in.orig	Fri Mar 24 11:24:14 2000
++++ Makefile.in	Mon Jun 26 20:57:26 2000
 @@ -60,7 +60,7 @@ install:    all installdirs
  
  installdirs:
diff --git a/net/ucd-snmp/patches/patch-Makefile_top b/net/ucd-snmp/patches/patch-Makefile_top
new file mode 100644
index 00000000000..61f9dbc2ab8
--- /dev/null
+++ b/net/ucd-snmp/patches/patch-Makefile_top
@@ -0,0 +1,11 @@
+$OpenBSD: patch-Makefile_top,v 1.1 2000/06/29 21:20:04 jakob Exp $
+--- Makefile.top.orig	Mon Apr 17 17:46:49 2000
++++ Makefile.top	Tue Jun 27 13:20:39 2000
+@@ -31,6 +31,7 @@ persistentdir	= @PERSISTENT_DIRECTORY@
+ # Programs
+ #
+ INSTALL		= @INSTALL@
++INSTALL_DATA	= @INSTALL_DATA@
+ SED		= @SED@
+ RANLIB		= @RANLIB@
+ LN_S		= @LN_S@
diff --git a/net/ucd-snmp/patches/patch-ad b/net/ucd-snmp/patches/patch-ad
deleted file mode 100644
index a0e3313eb40..00000000000
--- a/net/ucd-snmp/patches/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- local/tkmib.orig	Fri Jun  2 15:26:05 2000
-+++ local/tkmib	Fri Jun  2 15:26:11 2000
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl55 -w
-+#!/usr/bin/perl -w
- 
- require 5;
- 
diff --git a/net/ucd-snmp/patches/patch-ac b/net/ucd-snmp/patches/patch-agent_Makefile_in
similarity index 61%
rename from net/ucd-snmp/patches/patch-ac
rename to net/ucd-snmp/patches/patch-agent_Makefile_in
index 2922796a8bb..0f91a9d368b 100644
--- a/net/ucd-snmp/patches/patch-ac
+++ b/net/ucd-snmp/patches/patch-agent_Makefile_in
@@ -1,5 +1,6 @@
---- agent/Makefile.in.orig	Tue May 30 12:20:36 2000
-+++ agent/Makefile.in	Tue May 30 12:20:43 2000
+$OpenBSD: patch-agent_Makefile_in,v 1.1 2000/06/29 21:20:05 jakob Exp $
+--- agent/Makefile.in.orig	Fri Feb  4 16:15:08 2000
++++ agent/Makefile.in	Mon Jun 26 20:57:26 2000
 @@ -72,7 +72,7 @@ install:  installdirs
  
  installdirs:
diff --git a/net/ucd-snmp/patches/patch-aa b/net/ucd-snmp/patches/patch-configure
similarity index 83%
rename from net/ucd-snmp/patches/patch-aa
rename to net/ucd-snmp/patches/patch-configure
index 6d8e7ee1337..aa60e03ee4b 100644
--- a/net/ucd-snmp/patches/patch-aa
+++ b/net/ucd-snmp/patches/patch-configure
@@ -1,5 +1,6 @@
---- configure.orig	Tue May 30 11:30:18 2000
-+++ configure	Tue May 30 11:30:59 2000
+$OpenBSD: patch-configure,v 1.1 2000/06/29 21:20:05 jakob Exp $
+--- configure.orig	Fri May  5 18:50:13 2000
++++ configure	Mon Jun 26 20:57:26 2000
 @@ -1978,21 +1978,21 @@ if test "x$prefix" = "xNONE"; then
    prefix=/usr/local
  fi
diff --git a/net/ucd-snmp/patches/patch-local_tkmib b/net/ucd-snmp/patches/patch-local_tkmib
new file mode 100644
index 00000000000..c7e033ade72
--- /dev/null
+++ b/net/ucd-snmp/patches/patch-local_tkmib
@@ -0,0 +1,9 @@
+$OpenBSD: patch-local_tkmib,v 1.1 2000/06/29 21:20:05 jakob Exp $
+--- local/tkmib.orig	Mon Mar 13 16:27:45 2000
++++ local/tkmib	Mon Jun 26 20:57:26 2000
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl55 -w
++#!/usr/bin/perl -w
+ 
+ require 5;
+ 
diff --git a/net/ucd-snmp/patches/patch-mibs_Makefile_in b/net/ucd-snmp/patches/patch-mibs_Makefile_in
new file mode 100644
index 00000000000..3bb2bf86f07
--- /dev/null
+++ b/net/ucd-snmp/patches/patch-mibs_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-mibs_Makefile_in,v 1.1 2000/06/29 21:20:05 jakob Exp $
+--- mibs/Makefile.in.orig	Mon Jun 26 21:16:08 2000
++++ mibs/Makefile.in	Mon Jun 26 21:16:24 2000
+@@ -26,7 +26,7 @@ MIBS	= $(V1MIBS) $(V2MIBS) $(V2PMIBS) $(
+ all:
+ 
+ install: installdirs
+-	@for i in $(MIBS) ; do $(INSTALL) $(srcdir)/$$i $(mibdir) ; echo "install: installed $$i in $(mibdir)" ; done
++	@for i in $(MIBS) ; do $(INSTALL_DATA) $(srcdir)/$$i $(mibdir) ; echo "install: installed $$i in $(mibdir)" ; done
+ 
+ installdirs:
+ 	@$(SHELL) $(srcdir)/../mkinstalldirs $(mibdir)
diff --git a/net/ucd-snmp/pkg/DEINSTALL b/net/ucd-snmp/pkg/DEINSTALL
index 2797d8b2b73..1e5875c0491 100644
--- a/net/ucd-snmp/pkg/DEINSTALL
+++ b/net/ucd-snmp/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: DEINSTALL,v 1.1 2000/06/02 15:45:06 hugh Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2000/06/29 21:20:05 jakob Exp $
 #
 # de-installation of ucd-snmp
 
@@ -25,3 +25,4 @@ do_deinstall()
 }
 
 do_deinstall ${PERSISTENT_DIR}
+exit 0
diff --git a/net/ucd-snmp/pkg/DESCR b/net/ucd-snmp/pkg/DESCR
index d92e176799f..612468846df 100644
--- a/net/ucd-snmp/pkg/DESCR
+++ b/net/ucd-snmp/pkg/DESCR
@@ -14,3 +14,5 @@ to check and report functional status.  Examples: mountd(s) under
 Ultrix 4.3 which tend to fork themselves crazy and eventually fill
 up the process table; On our hp700s, "amd" sometimes stops working,
 HP VUE hangs and fails to start X, etc.
+
+WWW: ${HOMEPAGE}
diff --git a/net/ucd-snmp/pkg/INSTALL b/net/ucd-snmp/pkg/INSTALL
index 8704ed75034..e1725e81723 100644
--- a/net/ucd-snmp/pkg/INSTALL
+++ b/net/ucd-snmp/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.1 2000/06/02 15:45:06 hugh Exp $
+# $OpenBSD: INSTALL,v 1.2 2000/06/29 21:20:06 jakob Exp $
 #
 # post-installation setup of ucd-snmp
 
@@ -32,3 +32,4 @@ case $2 in
 	exit 1
 	;;
 esac
+exit 0
diff --git a/net/ucd-snmp/pkg/MESSAGE b/net/ucd-snmp/pkg/MESSAGE
index e94e67c348e..f85432ebf73 100644
--- a/net/ucd-snmp/pkg/MESSAGE
+++ b/net/ucd-snmp/pkg/MESSAGE
@@ -4,8 +4,8 @@
 | /usr/local/share/examples/ucd-snmp/EXAMPLE.conf.  Extra documentation has
 | also been installed in /usr/local/share/doc/ucd-snmp.
 |
-| To have snmpd start at boot time, add an entry similiar to the following in
-| /etc/rc.local.
+| To have snmpd start at boot time, you must have an entry similiar to the 
+| following in /etc/rc.local.
 |
 | 	if [ -x /usr/local/sbin/snmpd ]; then
 |		/usr/local/sbin/snmpd -c /etc/snmpd.conf && echo -n ' snmpd'