diff --git a/less.spec b/less.spec
index 09b5ed0..00473c9 100644
--- a/less.spec
+++ b/less.spec
@@ -1,7 +1,7 @@
 Summary: A text file browser similar to more, but better.
 Name: less
 Version: 358
-Release: 24
+Release: 27
 License: GPL
 Group: Applications/Text
 Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz
@@ -11,13 +11,14 @@ Source3: less.csh
 Patch0: less-shell.patch
 Patch1: less-edit.patch
 # Japanese patch
-Patch2: less-358+iso247-20001210.diff
+Patch2: less-358-iso254.patch
 Patch3: less-358-eline.patch
 # Patch to fix things which the Japanese patch broke:
 Patch4: less-358-charset.patch
 Patch5: less-358-rh.patch
 # One more patch for the broken i18n patch
 Patch6: less-number.patch
+Patch7: less-358-mf.patch
 URL: http://www.greenwoodsoftware.com/less/
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: ncurses-devel
@@ -35,11 +36,12 @@ files, and you'll use it frequently.
 %prep
 %setup -q
 %patch -p1 -b .bug
-#%patch2 -p1 -b .i18n
-%patch3 -p1 -b .eline
-#%patch4 -p1 -b .chset
+%patch2 -p1 -b .i18n
+#%patch3 -p1 -b .eline
+%patch4 -p1 -b .chset
 #%patch5 -p1 -b .rh
 #%patch6 -p1 -b .num
+%patch7 -p1 -b .mf
 
 %build
 %configure
@@ -64,6 +66,23 @@ install -c -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Jun 18 2002 Karsten Hopp <karsten@redhat.de> 358-27
+- added Kazushi (Jam) Marukawa ISO-2022 patch 254 to support multibyte 
+  characters
+- added Mike Fabians patch to fix bold/underlined non-ASCII 
+  characters in UTF-8 mode
+- finally added support for directories (#17456 and #62050)
+- re-enabled fallback if no charset could be found (#24463)
+- added Matt's fix for #26113
+- show changelog and filelist when viewing a rpm package (#64900)
+
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu Apr 25 2002 Than Ngo <than@redhat.com> 358-25
+- add fix to handle tar.bz2 file
+
 * Wed Jan 09 2002 Tim Powers <timp@redhat.com>
 - automated rebuild
 
diff --git a/lesspipe.sh b/lesspipe.sh
index 481c4bd..5a71d6f 100755
--- a/lesspipe.sh
+++ b/lesspipe.sh
@@ -22,13 +22,17 @@ lesspipe() {
 	fi ;;
   *.tar) tar tvvf "$1" ;;
   *.tgz|*.tar.gz|*.tar.[zZ]) tar tzvvf "$1" ;;
-  *.tar.bz2|*.tbz2) tar tIvvf "$1" ;;
+  *.tar.bz2|*.tbz2) bzip2 -dc "$1" | tar tvvf - ;;
   *.[zZ]|*.gz) gzip -dc -- "$1" ;;
   *.bz2) bzip2 -dc -- "$1" ;;
   *.zip) zipinfo -- "$1" ;;
-  *.rpm) rpm -qpivl -- "$1" ;;
+  *.rpm) rpm -qpivl --changelog -- "$1" ;;
   *.cpi|*.cpio) cpio -itv < "$1" ;;
   esac
 }
 
-lesspipe "$1" 2> /dev/null
+if [ -d "$1" ] ; then
+	/bin/ls -alF -- "$1"
+else
+	lesspipe "$1" 2> /dev/null
+fi