diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 3c42bcca6..cbb000286 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-28  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+	* extfs/*rpm: Patch by <rebel@atrey.karlin.mff.cuni.cz>: set
+	locale to C so that rpm does not confuse us
+
 2000-03-06  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
 
 	Patch by  Andrew V. Samoilov <sav@bcs.zp.ua>
diff --git a/vfs/extfs/rpm b/vfs/extfs/rpm
index a09c563d6..4aae23ce7 100644
--- a/vfs/extfs/rpm
+++ b/vfs/extfs/rpm
@@ -6,10 +6,16 @@
 # minor changes by Wojtek Pilorz (wpilorz@bdk.lublin.pl) 1997
 # minor changes by Michele Marziani (marziani@fe.infn.it) 1997
 # bug files by Marc Merlin (marcsoft@merlins.org) 1998
+# locale bugfix by Michal Svec (rebel@penguin.cz) 2000
 # (C) 1996 The Free Software Foundation.
 #
 #
 
+# override any locale for dates
+unset LC_ALL
+LC_TIME=C
+export LC_TIME
+
 mcrpmfs_list ()
 {
     # set MCFASTRPM_DFLT to 1 for faster rpm files handling by default, to 0 for
@@ -152,10 +158,6 @@ mcrpmfs_run ()
     esac
 }
 
-# override any locale for dates
-LC_ALL=C
-export LC_ALL
-
 umask 077
 case "$1" in
   list) mcrpmfs_list "$2"; exit 0;;
diff --git a/vfs/extfs/rpms b/vfs/extfs/rpms
index 67b3f64cf..59d4ceb1d 100755
--- a/vfs/extfs/rpms
+++ b/vfs/extfs/rpms
@@ -1,10 +1,18 @@
 #! /usr/bin/perl
 #
 # Written by Balazs Nagy (julian7@kva.hu) 1998
+# locale bugfix by Michal Svec (rebel@penguin.cz) 2000
 # (C) 1998 The Free Software Foundation.
 #
 #
 
+# override any locale for dates
+delete $ENV{"LC_ALL"};
+$ENV{"LC_TIME"}="C";
+
+#print $ENV{"LC_ALL"};
+#exit 0;
+
 sub gd
 {
     my ($dt) = @_;
@@ -45,9 +53,6 @@ sub list
     }
 }
 
-# override any locale for dates
-$ENV{"LC_ALL"}="C";
-
 #open O, ">>/tmp/tt";
 #print O "RPMS: ";
 #for $i (@ARGV) {
diff --git a/vfs/extfs/trpm b/vfs/extfs/trpm
index c9006c231..7ccfcc69d 100644
--- a/vfs/extfs/trpm
+++ b/vfs/extfs/trpm
@@ -6,10 +6,16 @@
 # minor changes by Wojtek Pilorz (wpilorz@bdk.lublin.pl) 1997
 # minor changes by Michele Marziani (marziani@fe.infn.it) 1997
 # slight changes to put rpm to Trpm by Balazs Nagy (julian7@kva.hu) 1998
+# locale bugfix by Michal Svec (rebel@penguin.cz) 2000
 # (C) 1996 The Free Software Foundation.
 #
 #
 
+# override any locale for dates
+unset LC_ALL
+LC_TIME=C
+export LC_TIME
+
 mcrpmfs_list ()
 {
     # set MCFASTRPM_DFLT to 1 for faster rpm files handling by default, to 0 for
@@ -143,9 +149,6 @@ mcrpmfs_run ()
     esac
 }
 
-# override any locale for dates
-LC_ALL=C
-export LC_ALL
 name=$2
 if [ ${name%%.trpm} = $name ]; then
 	name=`head -1 $name`