diff --git a/.cvsignore b/.cvsignore
index 06ce2e3..2ede8b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-p7zip_4.51_src_all-norar.tar.bz2
+p7zip_4.58_src_all-norar.tar.bz2
diff --git a/p7zip.spec b/p7zip.spec
index 1142fd3..1c40777 100644
--- a/p7zip.spec
+++ b/p7zip.spec
@@ -1,7 +1,7 @@
 Summary: Very high compression ratio file archiver
 Name: p7zip
-Version: 4.51
-Release: 4%{?dist}
+Version: 4.58
+Release: 1%{?dist}
 # Files under C/Compress/Lzma/ are dual LGPL or CPL
 License: LGPLv2 and (LGPLv2+ or CPL)
 Group: Applications/Archiving
@@ -14,8 +14,8 @@ URL: http://p7zip.sourceforge.net/
 # rm -f p7zip_${VERSION}/DOCS/unRarLicense.txt
 # tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION}
 Source: p7zip_%{version}_src_all-norar.tar.bz2
-Patch0: p7zip_4.51-norar.patch
-Patch1: p7zip_4.47-install.patch
+Patch0: p7zip_4.58-norar.patch
+Patch1: p7zip_4.58-install.patch
 Patch2: p7zip_4.51-nostrip.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %ifarch x86_64
@@ -104,7 +104,12 @@ find contrib -type f -exec chmod -x {} \;
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.51-4
+* Wed Jun 18 2008 Matthias Saou <http://freshrpms.net/> 4.58-1
+- Update to 4.58.
+- Update norar patch.
+- Update install patch.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug 22 2007 Matthias Saou <http://freshrpms.net/> 4.51-3
diff --git a/p7zip_4.47-install.patch b/p7zip_4.47-install.patch
deleted file mode 100644
index 52f0461..0000000
--- a/p7zip_4.47-install.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naupr p7zip_4.47.orig/install.sh p7zip_4.47/install.sh
---- p7zip_4.47.orig/install.sh	2007-05-26 12:22:11.000000000 +0200
-+++ p7zip_4.47/install.sh	2007-06-19 16:02:55.000000000 +0200
-@@ -56,49 +56,41 @@ then
-   then
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
-     cp bin/7za ${DEST_DIR}${DEST_SHARE}/7za
--    chmod 777 ${DEST_DIR}${DEST_SHARE}/7za
--    strip     ${DEST_DIR}${DEST_SHARE}/7za
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/7za
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/7za
-     echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7za
-     echo "${DEST_SHARE}/7za \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7za
--    chmod 555 ${DEST_DIR}${DEST_BIN}/7za
-+    chmod 755 ${DEST_DIR}${DEST_BIN}/7za
-   fi
- 
-   if [ -x bin/7zr ]
-   then
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
-     cp bin/7zr ${DEST_DIR}${DEST_SHARE}/7zr
--    chmod 777 ${DEST_DIR}${DEST_SHARE}/7zr
--    strip     ${DEST_DIR}${DEST_SHARE}/7zr
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/7zr
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/7zr
-     echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7zr
-     echo "${DEST_SHARE}/7zr \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7zr
--    chmod 555 ${DEST_DIR}${DEST_BIN}/7zr
-+    chmod 755 ${DEST_DIR}${DEST_BIN}/7zr
-   fi
- 
-   if [ -x bin/7zCon.sfx ]
-   then
-     echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-     cp bin/7zCon.sfx ${DEST_DIR}${DEST_SHARE}/7zCon.sfx
--    chmod 777 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx
--    strip     ${DEST_DIR}${DEST_SHARE}/7zCon.sfx
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/7zCon.sfx
-   fi
- 
-   if [ -x bin/7z ]
-   then
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7z"
-     cp bin/7z ${DEST_DIR}${DEST_SHARE}/7z
--    chmod 777 ${DEST_DIR}${DEST_SHARE}/7z
--    strip     ${DEST_DIR}${DEST_SHARE}/7z
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/7z
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/7z
-     cp -r bin/Codecs ${DEST_DIR}${DEST_SHARE}/
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/*/*
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/*/*
-     cp bin/7z.so ${DEST_DIR}${DEST_SHARE}/7z.so
--    chmod 555 ${DEST_DIR}${DEST_SHARE}/7z.so
-+    chmod 755 ${DEST_DIR}${DEST_SHARE}/7z.so
-     echo "#! /bin/sh" > ${DEST_DIR}${DEST_BIN}/7z
-     echo "${DEST_SHARE}/7z \"\$@\"" >> ${DEST_DIR}${DEST_BIN}/7z
--    chmod 555 ${DEST_DIR}${DEST_BIN}/7z
-+    chmod 755 ${DEST_DIR}${DEST_BIN}/7z
-   fi
- 
- else
-@@ -107,7 +99,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
-     mkdir -p ${DEST_DIR}${DEST_BIN}
-     cp bin/7za ${DEST_DIR}${DEST_BIN}/7za
--    chmod 555 ${DEST_DIR}${DEST_BIN}/7za
-+    chmod 755 ${DEST_DIR}${DEST_BIN}/7za
-   fi
- 
-   if [ -x bin/7zr ]
-@@ -115,7 +107,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
-     mkdir -p ${DEST_DIR}${DEST_BIN}
-     cp bin/7zr ${DEST_DIR}${DEST_BIN}/7zr
--    chmod 555 ${DEST_DIR}${DEST_BIN}/7zr
-+    chmod 755 ${DEST_DIR}${DEST_BIN}/7zr
-   fi
- fi
- 
-@@ -124,27 +116,27 @@ if [ -d DOCS ]
- then
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_DIR}${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1
- else
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7z.1 > ${DEST_DIR}${DEST_MAN}/man1/7z.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7z.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7z.1
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7za.1 > ${DEST_DIR}${DEST_MAN}/man1/7za.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7za.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7za.1
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > ${DEST_DIR}${DEST_MAN}/man1/7zr.1
--   chmod 444 ${DEST_DIR}${DEST_MAN}/man1/7zr.1
-+   chmod 644 ${DEST_DIR}${DEST_MAN}/man1/7zr.1
- fi
- 
- if [ -f README ]
-@@ -152,7 +144,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
-   mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
-   cp README ${DEST_DIR}${DEST_SHARE_DOC}/README
--  chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/README
-+  chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/README
- fi
- 
- if [ -f ChangeLog ]
-@@ -160,7 +152,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
-   mkdir -p ${DEST_DIR}${DEST_SHARE_DOC}
-   cp ChangeLog ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog
--  chmod 444 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog
-+  chmod 644 ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog
- fi
- 
- if [ -d DOCS ]
-@@ -168,7 +160,7 @@ then
-   echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
-   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 {} \;
-+  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type d -exec chmod 755 {} \;
-+  find ${DEST_DIR}${DEST_SHARE_DOC}/DOCS -type f -exec chmod 644 {} \;
- fi
- 
diff --git a/p7zip_4.58-install.patch b/p7zip_4.58-install.patch
new file mode 100644
index 0000000..078cf05
--- /dev/null
+++ b/p7zip_4.58-install.patch
@@ -0,0 +1,142 @@
+diff -Naupr p7zip_4.58.orig/install.sh p7zip_4.58/install.sh
+--- p7zip_4.58.orig/install.sh	2008-03-02 14:35:05.000000000 +0100
++++ p7zip_4.58/install.sh	2008-06-18 14:02:45.000000000 +0200
+@@ -54,49 +54,41 @@ then
+   then
+     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
+     cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za"
+-    chmod 777 "${DEST_DIR}${DEST_SHARE}/7za"
+-    strip     "${DEST_DIR}${DEST_SHARE}/7za"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}/7za"
++    chmod 755 "${DEST_DIR}${DEST_SHARE}/7za"
+     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za"
+     echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za"
+-    chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
++    chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
+   fi
+ 
+   if [ -x bin/7zr ]
+   then
+     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
+     cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr"
+-    chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr"
+-    strip     "${DEST_DIR}${DEST_SHARE}/7zr"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr"
++    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr"
+     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr"
+     echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr"
+-    chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
++    chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
+   fi
+ 
+   if [ -x bin/7zCon.sfx ]
+   then
+     echo "- installing ${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+     cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+-    chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+-    strip     "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
++    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
+   fi
+ 
+   if [ -x bin/7z ]
+   then
+     echo "- installing ${DEST_DIR}${DEST_BIN}/7z"
+     cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z"
+-    chmod 777 "${DEST_DIR}${DEST_SHARE}/7z"
+-    strip     "${DEST_DIR}${DEST_SHARE}/7z"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z"
++    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z"
+     cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/*
++    chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/*
+     cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so"
+-    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
++    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so"
+     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z"
+     echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z"
+-    chmod 555 "${DEST_DIR}${DEST_BIN}/7z"
++    chmod 755 "${DEST_DIR}${DEST_BIN}/7z"
+   fi
+ 
+ else
+@@ -105,7 +97,7 @@ else
+     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
+     mkdir -p "${DEST_DIR}${DEST_BIN}"
+     cp bin/7za "${DEST_DIR}${DEST_BIN}/7za"
+-    chmod 555  "${DEST_DIR}${DEST_BIN}/7za"
++    chmod 755  "${DEST_DIR}${DEST_BIN}/7za"
+   fi
+ 
+   if [ -x bin/7zr ]
+@@ -113,7 +105,7 @@ else
+     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
+     mkdir -p "${DEST_DIR}${DEST_BIN}"
+     cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr"
+-    chmod 555  "${DEST_DIR}${DEST_BIN}/7zr"
++    chmod 755  "${DEST_DIR}${DEST_BIN}/7zr"
+   fi
+ fi
+ 
+@@ -122,27 +114,27 @@ if [ -d DOCS ]
+ then
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
+    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
+    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ else
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
+    grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
+    grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
+ 
+    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+    grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+-   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
++   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
+ fi
+ 
+ if [ -f README ]
+@@ -150,7 +142,7 @@ then
+   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
+   mkdir -p  "${DEST_DIR}${DEST_SHARE_DOC}"
+   cp README "${DEST_DIR}${DEST_SHARE_DOC}/README"
+-  chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README"
++  chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README"
+ fi
+ 
+ if [ -f ChangeLog ]
+@@ -158,7 +150,7 @@ then
+   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
+   mkdir -p     "${DEST_DIR}${DEST_SHARE_DOC}"
+   cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
+-  chmod 444    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
++  chmod 644    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
+ fi
+ 
+ if [ -d DOCS ]
+@@ -166,7 +158,7 @@ then
+   echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
+   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 {} \;
++  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \;
++  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \;
+ fi
+ 
diff --git a/p7zip_4.51-norar.patch b/p7zip_4.58-norar.patch
similarity index 73%
rename from p7zip_4.51-norar.patch
rename to p7zip_4.58-norar.patch
index 798ed92..a4944ce 100644
--- a/p7zip_4.51-norar.patch
+++ b/p7zip_4.58-norar.patch
@@ -1,17 +1,17 @@
-diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile
---- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile	2007-07-24 21:02:45.000000000 +0200
-+++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile	2007-08-05 17:49:13.000000000 +0200
-@@ -85,9 +85,6 @@ Pbkdf2HmacSha1.o  \
+diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile
+--- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile	2008-05-06 21:50:19.000000000 +0200
++++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile	2008-06-18 13:03:07.000000000 +0200
+@@ -79,9 +79,6 @@ HmacSha1.o  \
+ Pbkdf2HmacSha1.o  \
  RandGen.o  \
  Sha1.o  \
- Sha256.o  \
 -RarAES.o  \
 -Rar20Cipher.o  \
 -Rar20Crypto.o  \
  WzAES.o  \
  ZipCipher.o  \
  ZipCrypto.o  \
-@@ -126,12 +123,6 @@ StreamUtils.o  \
+@@ -120,12 +117,6 @@ StreamUtils.o  \
  7zRegister.o  \
  7zSpecStream.o  \
  7zUpdate.o  \
@@ -24,10 +24,10 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile p7zip_4.51/CP
  ArjHandler.o  \
  ArjIn.o  \
  ArjRegister.o  \
-diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list
---- p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2007-07-24 21:08:44.000000000 +0200
-+++ p7zip_4.51/CPP/7zip/Bundles/Format7zFree/makefile.list	2007-08-05 17:49:47.000000000 +0200
-@@ -48,11 +48,6 @@ SRCS=\
+diff -Naupr p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list
+--- p7zip_4.58.orig/CPP/7zip/Bundles/Format7zFree/makefile.list	2008-05-08 10:27:51.000000000 +0200
++++ p7zip_4.58/CPP/7zip/Bundles/Format7zFree/makefile.list	2008-06-18 13:03:56.000000000 +0200
+@@ -44,11 +44,6 @@ SRCS=\
   ../../Compress/BZip2/BZip2Decoder.cpp \
   ../../Compress/BZip2/BZip2Encoder.cpp \
   ../../Compress/BZip2/BZip2Register.cpp \
@@ -36,20 +36,20 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.
 - ../../Compress/Rar/Rar3Decoder.cpp \
 - ../../Compress/Rar/Rar3Vm.cpp \
 - ../../Compress/Rar/RarCodecsRegister.cpp \
-  ../../Compress/BWT/BlockSort.cpp \
   ../../Compress/Implode/ImplodeDecoder.cpp \
   ../../Compress/Implode/ImplodeHuffmanDecoder.cpp \
-@@ -74,9 +69,6 @@ SRCS=\
+  ../../Compress/Lzx/Lzx86Converter.cpp \
+@@ -68,9 +63,6 @@ SRCS=\
+  ../../Crypto/Hash/Pbkdf2HmacSha1.cpp \
   ../../Crypto/Hash/RandGen.cpp \
   ../../Crypto/Hash/Sha1.cpp \
-  ../../Crypto/Hash/Sha256.cpp \
 - ../../Crypto/RarAES/RarAES.cpp \
 - ../../Crypto/Rar20/Rar20Cipher.cpp \
 - ../../Crypto/Rar20/Rar20Crypto.cpp \
   ../../Crypto/WzAES/WzAES.cpp \
   ../../Crypto/Zip/ZipCipher.cpp \
   ../../Crypto/Zip/ZipCrypto.cpp \
-@@ -115,12 +107,6 @@ SRCS=\
+@@ -109,12 +101,6 @@ SRCS=\
   ../../Archive/7z/7zRegister.cpp \
   ../../Archive/7z/7zSpecStream.cpp \
   ../../Archive/7z/7zUpdate.cpp \
@@ -62,7 +62,7 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.
   ../../Archive/Arj/ArjHandler.cpp \
   ../../Archive/Arj/ArjIn.cpp \
   ../../Archive/Arj/ArjRegister.cpp \
-@@ -330,16 +316,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ
+@@ -324,16 +310,6 @@ BZip2Encoder.o : ../../Compress/BZip2/BZ
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Encoder.cpp
  BZip2Register.o : ../../Compress/BZip2/BZip2Register.cpp
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BZip2/BZip2Register.cpp
@@ -76,13 +76,13 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.
 -	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/Rar3Vm.cpp
 -RarCodecsRegister.o : ../../Compress/Rar/RarCodecsRegister.cpp
 -	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Rar/RarCodecsRegister.cpp
- BlockSort.o : ../../Compress/BWT/BlockSort.cpp
- 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/BWT/BlockSort.cpp
  ImplodeDecoder.o : ../../Compress/Implode/ImplodeDecoder.cpp
-@@ -382,12 +358,6 @@ Sha1.o : ../../Crypto/Hash/Sha1.cpp
+ 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Compress/Implode/ImplodeDecoder.cpp
+ ImplodeHuffmanDecoder.o : ../../Compress/Implode/ImplodeHuffmanDecoder.cpp
+@@ -372,12 +348,6 @@ RandGen.o : ../../Crypto/Hash/RandGen.cp
+ 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/RandGen.cpp
+ Sha1.o : ../../Crypto/Hash/Sha1.cpp
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha1.cpp
- Sha256.o : ../../Crypto/Hash/Sha256.cpp
- 	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/Hash/Sha256.cpp
 -RarAES.o : ../../Crypto/RarAES/RarAES.cpp
 -	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/RarAES/RarAES.cpp
 -Rar20Cipher.o : ../../Crypto/Rar20/Rar20Cipher.cpp
@@ -92,7 +92,7 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.
  WzAES.o : ../../Crypto/WzAES/WzAES.cpp
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Crypto/WzAES/WzAES.cpp
  ZipCipher.o : ../../Crypto/Zip/ZipCipher.cpp
-@@ -464,18 +434,6 @@ StreamUtils.o : ../../Common/StreamUtils
+@@ -454,18 +424,6 @@ StreamUtils.o : ../../Common/StreamUtils
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zSpecStream.cpp
  7zUpdate.o : ../../Archive/7z/7zUpdate.cpp
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/7z/7zUpdate.cpp
@@ -111,30 +111,30 @@ diff -Naupr p7zip_4.51.orig/CPP/7zip/Bundles/Format7zFree/makefile.list p7zip_4.
  ArjHandler.o : ../../Archive/Arj/ArjHandler.cpp
  	$(CXX) $(CC_SHARED) $(CFLAGS) ../../Archive/Arj/ArjHandler.cpp
  ArjIn.o : ../../Archive/Arj/ArjIn.cpp
-diff -Naupr p7zip_4.51.orig/makefile p7zip_4.51/makefile
---- p7zip_4.51.orig/makefile	2007-06-30 09:25:51.000000000 +0200
-+++ p7zip_4.51/makefile	2007-08-05 17:50:16.000000000 +0200
-@@ -38,7 +38,6 @@ depend:
+diff -Naupr p7zip_4.58.orig/makefile p7zip_4.58/makefile
+--- p7zip_4.58.orig/makefile	2008-05-18 13:34:05.000000000 +0200
++++ p7zip_4.58/makefile	2008-06-18 13:04:17.000000000 +0200
+@@ -41,7 +41,6 @@ depend:
  	cd CPP/7zip/UI/Client7z       ; $(MAKE) depend
  	cd CPP/7zip/UI/Console        ; $(MAKE) depend
  	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend
 -	cd CPP/7zip/Compress/Rar      ; $(MAKE) depend
  
  sfx: common
- 	mkdir -p  bin
-@@ -48,7 +47,6 @@ sfx: common
- 	mkdir -p  bin/Codecs
+ 	$(MKDIR) bin
+@@ -51,7 +50,6 @@ sfx: common
+ 	$(MKDIR) bin/Codecs
  	cd CPP/7zip/UI/Console           ; $(MAKE) all
  	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all
 -	cd CPP/7zip/Compress/Rar         ; $(MAKE) all
  
  clean:
  	cd CPP/myWindows                 ; $(MAKE) clean
-@@ -58,7 +56,6 @@ clean:
+@@ -61,7 +59,6 @@ clean:
  	cd CPP/7zip/UI/Client7z          ; $(MAKE) clean
  	cd CPP/7zip/UI/Console           ; $(MAKE) clean
  	cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean
 -	cd CPP/7zip/Compress/Rar         ; $(MAKE) clean
  	cd CPP/7zip/Compress/LZMA_Alone  ; $(MAKE) clean
+ 	cd CPP/7zip/Compress/PPMD_Alone  ; $(MAKE) clean
  	cd CPP/7zip/Bundles/AloneGCOV    ; $(MAKE) clean
- 	rm -fr bin
diff --git a/sources b/sources
index b507337..7712154 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f56f89b77f77f2e7661109a88ecddce3  p7zip_4.51_src_all-norar.tar.bz2
+29d06b768154d114de31bedd1dfd57c8  p7zip_4.58_src_all-norar.tar.bz2