diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index 196cbb5d6..07c5cb1d0 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-23  Pavel Machek  <pavel@artax.karlin.mff.cuni.cz>
+
+	* cpio.c: cpio.h is missing, so don't try to include it. (It is
+	not needed, anyway. Strange.)
+
+	* Makefile.in (NONETFILES): cpio added to compilation list
+
 2000-02-23  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* ftpfs.c: Definition of PORT changed in the middle of ftpfs.c
diff --git a/vfs/Makefile.in b/vfs/Makefile.in
index 9dfb9cd12..7fc2dd4e8 100644
--- a/vfs/Makefile.in
+++ b/vfs/Makefile.in
@@ -18,10 +18,11 @@ AR = @AR@
 # VFS code
 #
 NETFILES   = tcputil.o ftpfs.o mcfs.o utilvfs.o
-NONETFILES = local.o vfs.o tar.o names.o container.o extfs.o sfs.o fish.o direntry.o @undelfs_o@
+NONETFILES = local.o vfs.o tar.o names.o container.o extfs.o sfs.o fish.o direntry.o cpio.o @undelfs_o@
 
 VFSSRCS = local.c vfs.c mcfs.c tcputil.c tar.c names.c \
-	ftpfs.c container.c mcserv.c extfs.c undelfs.c utilvfs.c sfs.c fish.c
+	ftpfs.c container.c mcserv.c extfs.c undelfs.c utilvfs.c sfs.c fish.c \
+	cpio.c
 
 VFSHDRS = vfs.h mcfs.h tcputil.h tar.h container.h ftpfs.h names.h \
 	extfs.h
@@ -40,7 +41,7 @@ EXTFSSTUFF = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFS_IN)
 # Commands to build standalone version (.so)
 #
 
-VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so tar.so names.so container.so extfs.so util-alone.so util.sor utilunix.sor sfs.so fish.so direntry.so
+VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so tar.so names.so container.so extfs.so util-alone.so util.sor utilunix.sor sfs.so fish.so direntry.so cpio.so
 
 %.sor:	../src/%.c
 	$(CC) -c -fpic $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@
diff --git a/vfs/cpio.c b/vfs/cpio.c
index 54d3cd5b4..86a3970bb 100644
--- a/vfs/cpio.c
+++ b/vfs/cpio.c
@@ -29,7 +29,7 @@
 /* #include "utilvfs.h" */
 
 #include "../src/dialog.h"
-#include "cpio.h"
+//#include "cpio.h"
 #include "names.h"
 
 enum {