diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile
index 9075c766946..e79a6000022 100644
--- a/net/oinkmaster/Makefile
+++ b/net/oinkmaster/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.8 2004/09/15 00:06:59 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.9 2004/12/05 18:22:57 robert Exp $
 
 COMMENT=	"update your Snort 1.8+ rules"
 
-DISTNAME=	oinkmaster-0.9
+DISTNAME=	oinkmaster-1.1
 CATEGORIES=	net security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=oinkmaster/}
 
@@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP= 	Yes
 RUN_DEPENDS=		::net/wget
 
 NO_BUILD=Yes
+NO_REGRESS=Yes
 PKG_ARCH=*
 
 do-install:
@@ -24,7 +25,10 @@ do-install:
 	    ${WRKSRC}/oinkmaster.pl > ${WRKSRC}/oinkmaster-
 	${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster- ${PREFIX}/bin/oinkmaster
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oinkmaster
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oinkmaster
 	${INSTALL_DATA}	${WRKSRC}/oinkmaster.conf \
-		        ${PREFIX}/share/examples/oinkmaster
+			${WRKSRC}/template-examples.conf \
+			${PREFIX}/share/examples/oinkmaster
+	${INSTALL_DATA} ${WRKSRC}/README.templates ${PREFIX}/share/doc/oinkmaster
 
 .include <bsd.port.mk>
diff --git a/net/oinkmaster/distinfo b/net/oinkmaster/distinfo
index 92eb2fd71e8..f5117d20a5b 100644
--- a/net/oinkmaster/distinfo
+++ b/net/oinkmaster/distinfo
@@ -1,3 +1,3 @@
-MD5 (oinkmaster-0.9.tar.gz) = 8ed30c07f2ef5c977e1201a014bf9c5c
-RMD160 (oinkmaster-0.9.tar.gz) = dd9147ea0c377e35f3a97eb655b6f666b325d9ee
-SHA1 (oinkmaster-0.9.tar.gz) = 5e1e6417882743b3c4669e32e1ab8105a04c6ab0
+MD5 (oinkmaster-1.1.tar.gz) = 28cfaf6220f5fc3fa3f3838ea33cecf1
+RMD160 (oinkmaster-1.1.tar.gz) = bb4e58007a5f67ad2ca9a886013b6c9764e05abd
+SHA1 (oinkmaster-1.1.tar.gz) = be216566653352782615a752993968246c4ee102
diff --git a/net/oinkmaster/patches/patch-oinkmaster_1 b/net/oinkmaster/patches/patch-oinkmaster_1
new file mode 100644
index 00000000000..a54f52037dd
--- /dev/null
+++ b/net/oinkmaster/patches/patch-oinkmaster_1
@@ -0,0 +1,47 @@
+$OpenBSD: patch-oinkmaster_1,v 1.1 2004/12/05 18:22:57 robert Exp $
+--- oinkmaster.1.orig	Sun Dec  5 19:05:14 2004
++++ oinkmaster.1	Sun Dec  5 19:05:51 2004
+@@ -8,7 +8,7 @@
+ .B oinkmaster
+ \- update Snort signatures
+ .SH SYNOPSIS
+-.B oinkmaster.pl -o
++.B oinkmaster -o
+ .I outdir
+ [options]
+ .SH DESCRIPTION
+@@ -154,14 +154,14 @@
+ and put the new rules in /etc/rules/:
+ .PP
+ .nf
+-\fB    oinkmaster.pl -o /etc/rules \fP
++\fB    oinkmaster -o /etc/rules \fP
+ .fi
+ .PP
+ Grab rules archive from local filesystem and do not print anything unless
+ it contains updated rules:
+ .PP
+ .nf
+-\fB    oinkmaster.pl -u file:///tmp/rules.tar.gz -o /etc/rules -q \fP
++\fB    oinkmaster -u file:///tmp/rules.tar.gz -o /etc/rules -q \fP
+ .fi
+ .PP
+ Download rules archive from default location, make backup of old rules if
+@@ -172,7 +172,7 @@
+ first encrypting the content.) 
+ .PP
+ .nf
+-\fB    oinkmaster.pl -o /etc/snort/rules -b /etc/snort/backup 2>&1 | \fP\\
++\fB    oinkmaster -o /etc/snort/rules -b /etc/snort/backup 2>&1 | \fP\\
+ \fB    mail -s "subject" user@example.com
+ .fi
+ .PP
+@@ -184,7 +184,7 @@
+ .PP
+ .nf
+ \fB    TMP=`mktemp /tmp/oinkmaster.XXXXXX` && \fP\\
+-\fB    (oinkmaster.pl -C /etc/oinkmaster-global.conf \fP\\
++\fB    (oinkmaster -C /etc/oinkmaster-global.conf \fP\\
+ \fB    -C /etc/oinkmaster-sensor.conf -o /etc/rules \fP\\
+ \fB    -U /etc/snort.conf \fP\\
+ \fB    -u scp://user@example.com:/home/user/rules.tar.gz \fP\\
diff --git a/net/oinkmaster/patches/patch-oinkmaster_conf b/net/oinkmaster/patches/patch-oinkmaster_conf
index 5b96b2ad4cf..186b149eecf 100644
--- a/net/oinkmaster/patches/patch-oinkmaster_conf
+++ b/net/oinkmaster/patches/patch-oinkmaster_conf
@@ -1,13 +1,16 @@
-$OpenBSD: patch-oinkmaster_conf,v 1.1 2004/02/29 13:58:11 lebel Exp $
---- oinkmaster.conf.orig	2003-11-30 15:01:57.000000000 -0500
-+++ oinkmaster.conf	2004-02-29 08:46:38.000000000 -0500
-@@ -15,7 +15,8 @@
+$OpenBSD: patch-oinkmaster_conf,v 1.2 2004/12/05 18:22:57 robert Exp $
+--- oinkmaster.conf.orig	Sat Oct  9 15:28:24 2004
++++ oinkmaster.conf	Sun Dec  5 19:11:01 2004
+@@ -36,10 +36,10 @@
+ # is the most recent version of Snort at the time of this writing.
+ # This may have changed by the time you read this, so make
+ # sure to follow the instructions above.
+-url = http://www.snort.org/dl/rules/snortrules-snapshot-2_2.tar.gz
++# url = http://www.snort.org/dl/rules/snortrules-snapshot-2_2.tar.gz
  
- # Use this one if you're running the latest release version of Snort
- # (or following snort-STABLE):
--url = http://www.snort.org/dl/rules/snortrules-stable.tar.gz
-+#url = http://www.snort.org/dl/rules/snortrules-stable.tar.gz
-+url = http://www.snort.org/dl/rules/snortrules-snapshot-2_0.tar.gz
+ # This is for Snort 2.1.x.
+-# url = http://www.snort.org/dl/rules/snortrules-snapshot-2_1.tar.gz
++url = http://www.snort.org/dl/rules/snortrules-snapshot-2_1.tar.gz
  
- # Use this one *only* if you're following snort-CURRENT.
- # This ruleset may only work with recent develop snapshots of Snort!
+ # If you use Snort 2.0.x (which is deprecated):
+ # url = http://www.snort.org/dl/rules/snortrules-snapshot-2_0.tar.gz
diff --git a/net/oinkmaster/pkg/PLIST b/net/oinkmaster/pkg/PLIST
index 3bd9d39387e..3f96fe95daa 100644
--- a/net/oinkmaster/pkg/PLIST
+++ b/net/oinkmaster/pkg/PLIST
@@ -1,5 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/09/15 18:17:42 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2004/12/05 18:22:57 robert Exp $
 bin/oinkmaster
+share/doc/oinkmaster/
+share/doc/oinkmaster/README.templates
 share/examples/oinkmaster/
 share/examples/oinkmaster/oinkmaster.conf
 @sample ${SYSCONFDIR}/oinkmaster.conf
+share/examples/oinkmaster/template-examples.conf