diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 22f1c94a4..fb25a2538 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-12  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* cpio.c (cpio_skip_padding): Handle old ASCII format.
+
+2002-04-08  Pavel Roskin  <proski@gnu.org>
+
+	* samba/configure.in: Require Autoconf 2.52 to make Debian
+	wrapper around Autoconf happy.
+	From Björn Eriksson <bjorn@bjornen.nu>
+
 2002-03-06  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* direntry.c (vfs_s_resolve_symlink): Comment out buggy code.
diff --git a/vfs/cpio.c b/vfs/cpio.c
index c860ec9ef..0ab462603 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -119,6 +119,8 @@ static int cpio_skip_padding(vfs_s_super *super)
     case CPIO_NEWC:
     case CPIO_CRC:
 	return CPIO_SEEK_CUR(super, (4 - (CPIO_POS(super) % 4)) % 4);
+    case CPIO_OLDC:
+	return CPIO_POS(super);
     default:
 	g_assert_not_reached();
 	return 42; /* & the compiler is happy :-) */
@@ -449,7 +451,7 @@ static int cpio_create_entry(vfs *me, vfs_s_super *super, struct stat *stat, cha
 		   'No such file or directory' is such case) */
 
 	if(!S_ISDIR(entry->ino->st.st_mode)) { /* This can be considered archive inconsistency */
-	    message_2s(1, MSG_ERROR, _("%s contains duplicit entries! Skiping!"), super->name);
+	    message_2s(1, MSG_ERROR, _("%s contains duplicit entries! Skipping!"), super->name);
 	} else {
 	    entry->ino->st.st_mode = stat->st_mode;
 	    entry->ino->st.st_uid = stat->st_uid;