diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 8c342cf0a87..fc4bd8627f3 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,18 +1,18 @@
-# $OpenBSD: Makefile,v 1.7 2007/12/16 11:22:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2008/06/10 03:24:37 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT-main=	file archiver with high compression ratio
 COMMENT-rar=	rar modules for p7zip
 
-V=		4.57
+V=		4.58
 DISTNAME=	p7zip_${V}_src_all
 PKGNAME=	p7zip-${V}
 PKGNAME-main=	p7zip-${V}
 PKGNAME-rar=	p7zip-rar-${V}
 CATEGORIES=	archivers
 
-HOMEPAGE=	http://www.7-zip.org/
+HOMEPAGE=	http://sourceforge.net/projects/p7zip/
 
 MAINTAINER=	Josh Grosse <josh@jggimi.homeip.net>
 
diff --git a/archivers/p7zip/distinfo b/archivers/p7zip/distinfo
index da61571a6ee..7b111cc3bc8 100644
--- a/archivers/p7zip/distinfo
+++ b/archivers/p7zip/distinfo
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.57_src_all.tar.bz2) = dz942LKX64WGJmZ9TfqTxw==
-RMD160 (p7zip_4.57_src_all.tar.bz2) = r0BWO06thNE46f/wOiZ3VAxQ0p0=
-SHA1 (p7zip_4.57_src_all.tar.bz2) = 7aXePTVWfiYzNz2+YDE1J6ak2yc=
-SHA256 (p7zip_4.57_src_all.tar.bz2) = AOkjOG3VPVMqhjMdFpTq7uYmeDr6UD+R7fc3A1fgW1M=
-SIZE (p7zip_4.57_src_all.tar.bz2) = 1473608
+MD5 (p7zip_4.58_src_all.tar.bz2) = MVsYQQLBfElW9TIY2XMiLQ==
+RMD160 (p7zip_4.58_src_all.tar.bz2) = LDGrZXJ13AHS0jxd4jJ9XuRvToo=
+SHA1 (p7zip_4.58_src_all.tar.bz2) = dSW7sS7JQYbp5A02FM39X29jyrY=
+SHA256 (p7zip_4.58_src_all.tar.bz2) = UjkVWbd4LSutRbeDV56pgl8oZwum8jT9DZJIrz6Cvt0=
+SIZE (p7zip_4.58_src_all.tar.bz2) = 1948207
diff --git a/archivers/p7zip/patches/patch-install_sh b/archivers/p7zip/patches/patch-install_sh
index d9d5be3cc29..71890b38780 100644
--- a/archivers/p7zip/patches/patch-install_sh
+++ b/archivers/p7zip/patches/patch-install_sh
@@ -1,6 +1,6 @@
-$OpenBSD: patch-install_sh,v 1.1.1.1 2007/04/20 17:50:05 steven Exp $
---- install.sh.orig	Tue Jun 27 23:09:12 2006
-+++ install.sh	Wed Jan 10 19:27:47 2007
+$OpenBSD: patch-install_sh,v 1.2 2008/06/10 03:24:38 sthen Exp $
+--- install.sh.orig	Sun Mar  2 13:35:05 2008
++++ install.sh	Mon Jun  9 20:27:58 2008
 @@ -1,14 +1,14 @@
  #! /bin/sh
  
@@ -11,25 +11,25 @@ $OpenBSD: patch-install_sh,v 1.1.1.1 2007/04/20 17:50:05 steven Exp $
  # DEST_HOME=${HOME}/INSTALL/usr/local
  DEST_BIN=${DEST_HOME}/bin
  DEST_SHARE=${DEST_HOME}/lib/p7zip
- DEST_SHARE_DOC=${DEST_HOME}/share/doc/p7zip
  DEST_MAN=${DEST_HOME}/man
+ DEST_SHARE_DOC=${DEST_HOME}/share/doc/p7zip
 -DEST_DIR=
 +DEST_DIR=${DESTDIR}
- [ "$1" ] && DEST_BIN=$1
- [ "$2" ] && DEST_SHARE=$2
- [ "$3" ] && DEST_MAN=$3
+ [ "$1" ] && DEST_BIN="$1"
+ [ "$2" ] && DEST_SHARE="$2"
+ [ "$3" ] && DEST_MAN="$3"
 @@ -163,10 +163,10 @@ fi
  
  if [ -d DOCS ]
  then
 -  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
 +  echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}"
-   mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
--  cp -r DOCS ${DEST_DIR}${DEST_SHARE_DOC}/DOCS
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 555 {} \;
--  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 444 {} \;
-+  cp -r DOCS/* ${DEST_DIR}${DEST_SHARE_DOC}
-+  find ${DEST_DIR}${DEST_SHARE_DOC} -type d -exec chmod 555 {} \;
-+  find ${DEST_DIR}${DEST_SHARE_DOC} -type f -exec chmod 444 {} \;
+   mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
+-  cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
+-  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \;
+-  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \;
++  cp -r DOCS/* "${DEST_DIR}${DEST_SHARE_DOC}"
++  find "${DEST_DIR}${DEST_SHARE_DOC}" -type d -exec chmod 555 {} \;
++  find "${DEST_DIR}${DEST_SHARE_DOC}" -type f -exec chmod 444 {} \;
  fi
  
diff --git a/archivers/p7zip/patches/patch-makefile_openbsd b/archivers/p7zip/patches/patch-makefile_openbsd
index 42362ca81c1..f235d5ed282 100644
--- a/archivers/p7zip/patches/patch-makefile_openbsd
+++ b/archivers/p7zip/patches/patch-makefile_openbsd
@@ -1,8 +1,8 @@
-$OpenBSD: patch-makefile_openbsd,v 1.1.1.1 2007/04/20 17:50:05 steven Exp $
---- makefile.openbsd.orig	Fri May 19 19:52:42 2006
-+++ makefile.openbsd	Mon Apr 16 09:52:33 2007
-@@ -3,17 +3,17 @@
- # LITTLE_ENDIAN and BIG_ENDIAN are already defined by the system headers
+$OpenBSD: patch-makefile_openbsd,v 1.2 2008/06/10 03:24:38 sthen Exp $
+--- makefile.openbsd.orig	Wed Aug  8 05:15:29 2007
++++ makefile.openbsd	Sun Jun  8 11:50:18 2008
+@@ -2,17 +2,17 @@
+ # makefile for OpenBSD (x86, PPC, alpha ...)
  #
  
 -OPTFLAGS=-O