diff --git a/security/siphon/Makefile b/security/siphon/Makefile
index a0d172da198..a8abe115019 100644
--- a/security/siphon/Makefile
+++ b/security/siphon/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2002/01/24 06:48:03 jsyn Exp $
+# $OpenBSD: Makefile,v 1.6 2002/03/25 06:30:38 jsyn Exp $
 			
 COMMENT=		"passive network mapping tool"
 
 DISTNAME=		siphon-v.666
 PKGNAME=		siphon-0.666
 CATEGORIES=    		security net
-NEED_VERSION=		1.504
-
-HOMEPAGE=		http://www.gravitino.net/projects/siphon/
+NEED_VERSION=		1.515
 
 MAINTAINER=		Jason Peel <jsyn@openbsd.org>
 
@@ -16,8 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://www.gravitino.net/projects/siphon/ \
-			http://siphon.datanerds.net/ \
+MASTER_SITES=		http://siphon.datanerds.net/ \
 			${MASTER_SITE_PACKETSTORM}
 MASTER_SITE_SUBDIR=	UNIX/utilities
 
diff --git a/security/siphon/pkg/DEINSTALL b/security/siphon/pkg/DEINSTALL
index 3b7bd79259c..5c7f35b461e 100644
--- a/security/siphon/pkg/DEINSTALL
+++ b/security/siphon/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.2 2001/06/30 00:52:20 lebel Exp $
+# $OpenBSD: DEINSTALL,v 1.3 2002/03/25 06:30:38 jsyn Exp $
 #
 # siphon de-installation
 
@@ -8,13 +8,13 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/osprints.conf
 
-if [ -f $CONFIG_FILE ]; then
+if [ -f ${CONFIG_FILE} ]; then
     echo
     echo "+---------------"
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| this step as root:"
     echo "|"
-    echo "|           rm -f $CONFIG_FILE"
+    echo "|           rm -f ${CONFIG_FILE}"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."
diff --git a/security/siphon/pkg/DESCR b/security/siphon/pkg/DESCR
index 663e87000f2..d27e529aa06 100644
--- a/security/siphon/pkg/DESCR
+++ b/security/siphon/pkg/DESCR
@@ -10,5 +10,3 @@ intrusion detection systems. In fact, we send out no packets at
 all.  Whereas nmap crashes some machines and network hardware when
 performing its active OS detection tests, Siphon would never crash
 remote machines.  Siphon is available for UNIX and Win32.
-
-WWW: ${HOMEPAGE}
diff --git a/security/siphon/pkg/INSTALL b/security/siphon/pkg/INSTALL
index 46cb3c6aaae..9e3c14bcd2e 100644
--- a/security/siphon/pkg/INSTALL
+++ b/security/siphon/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.3 2001/07/05 23:24:18 jsyn Exp $
+# $OpenBSD: INSTALL,v 1.4 2002/03/25 06:30:38 jsyn Exp $
 #
 # Pre/post-installation setup of siphon
 
@@ -9,15 +9,15 @@ set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/osprints.conf
-SAMPLE_CONFIG_DIR=$PREFIX/share/examples/siphon
+SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/siphon
 
 do_notice()
 {
     echo
     echo "+---------------"
-    echo "| The existing $1 configuration file in $CONFIG_FILE,"
+    echo "| The existing $1 configuration file in ${CONFIG_FILE},"
     echo "| has NOT been changed. You may want to compare it to the"
-    echo "| current sample file in $SAMPLE_CONFIG_DIR,"
+    echo "| current sample file in ${SAMPLE_CONFIG_DIR},"
     echo "| and update your configuration as needed."
     echo "+---------------"
     echo
@@ -25,12 +25,12 @@ do_notice()
 
 do_install()
 {
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/osprints.conf \
-   				    $CONFIG_FILE
+    install -o root -g wheel -m 644 ${SAMPLE_CONFIG_DIR}/osprints.conf \
+   				    ${CONFIG_FILE}
     echo
     echo "+---------------"
     echo "| The $1 configuration file has been installed at"
-    echo "| $CONFIG_FILE. Please view this file and change the configuration"
+    echo "| ${CONFIG_FILE}. Please view this file and change the configuration"
     echo "| to meet your needs."
     echo "+---------------"
     echo
@@ -50,7 +50,7 @@ case $2 in
 	: nothing to pre-install for this port
 	;;
     POST-INSTALL)
-	if [ ! -f $CONFIG_FILE ]; then
+	if [ ! -f ${CONFIG_FILE} ]; then
 	    do_install $1
 	else
 	    do_notice $1