diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index c220b6b69..aba37132c 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,5 +1,10 @@
 2002-12-09  Pavel Roskin  <proski@gnu.org>
 
+	* extfs/ftplist.in: Remove, it's obsoleted by the hotlist.
+	* extfs/ucpio.in: Remove, it's obsoleted ucpio.c.
+	* extfs/Makefile.am: Remove all references to them.
+	* extfs/extfs.ini: Likewise.
+
 	* extfs.c (__find_entry): When creating entried for regular
 	files, set initial permissions to S_IFREG | 0666.  This fixes
 	problems with viewing and editing newly added files.
diff --git a/vfs/extfs/Makefile.am b/vfs/extfs/Makefile.am
index 705167d16..3d16e1652 100644
--- a/vfs/extfs/Makefile.am
+++ b/vfs/extfs/Makefile.am
@@ -11,11 +11,9 @@ EXTFS_CONST = a apt audio deba debd dpkg hp48 mailfs patchfs rpm bpp \
 EXTFS_IN    = 			\
 	deb.in 			\
 	lslR.in 		\
-	ucpio.in 		\
 	urar.in 		\
 	uzip.in 		\
 	uzoo.in 		\
-	ftplist.in 		\
 	uar.in 			\
 	ulha.in 		\
 	uha.in
@@ -24,11 +22,9 @@ EXTFS_IN    = 			\
 EXTFS_OUT = 			\
 	deb 			\
 	lslR 			\
-	ucpio 			\
 	urar 			\
 	uzip 			\
 	uzoo 			\
-	ftplist 		\
 	uar 			\
 	ulha 			\
 	uha
diff --git a/vfs/extfs/extfs.ini b/vfs/extfs/extfs.ini
index a29805d80..46747d9e4 100644
--- a/vfs/extfs/extfs.ini
+++ b/vfs/extfs/extfs.ini
@@ -7,15 +7,12 @@ uzoo
 ulha
 urar
 uha
-# For arj usage you need special patch to unarj
+# For arj usage you need a special patch to unarj (see unarj.diff)
 uarj
 
 # ar is used for static libraries
 uar
 
-# cpio archiver (unix)
-# ucpio
-
 # Packages from popular Linux distributions
 rpm
 deb
@@ -26,19 +23,16 @@ a:
 # For browsing lslR listings (found on many ftp sites)
 lslR
 
-# Simple fs for list of popular ftp sites
-ftplist
-
-# Hewlet packard calculator
+# Hewlett Packard calculator
 hp48:
 
-# Breaks patches into chunks
+# Break patches into chunks
 patchfs
 
 # Represents a mailbox as a directory
 mailfs
 
-# Lists the rpms on the system
+# List all installed RPM packages on the system
 rpms:
 trpm
 
@@ -53,5 +47,5 @@ deba
 # Simple filesystem for audio cdroms. Use /dev/cdrom#audio (or /#audio).
 audio
 
-# Package of a new italian distribution: Bad Penguin
+# Package of Bad Penguin (an Italian GNU/Linux distribution)
 bpp
diff --git a/vfs/extfs/ftplist.in b/vfs/extfs/ftplist.in
deleted file mode 100644
index 57b2d5e07..000000000
--- a/vfs/extfs/ftplist.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-# This fs implements a simple database of your favourite ftp servers.
-# The `archive' is a text file containing a list of ftp URL's one per line
-# like this (followed optionaly by name under which the link will be
-# shown - shouldn't contain spaces inside)
-#
-## ftp://sunsite.unc.edu/pub/Linux sunsite
-## ftp://tsx-11.mit.edu/pub/linux tsx-11
-## ftp://ftp.cvut.cz/pub/linux cvut
-## ftp://jj@jfch.vc.cvut.cz:21/ my_machine
-#
-# You should refer only to directories, not to particular files.
-# The file has to use `ftplist' extension (if you don't like it, change
-# it in mc.ext resp. $HOME/.mc/ext). So the file name should match 
-# regex ^.*ftplist$
-#
-# If you add "#define WANT_PARSE" to main.c you will be able to hit return
-# on the filenames in order to connect to the ftp servers.
-#
-
-mcftplistfs_list ()
-{
-    { ls -l $1; cat $1; } | @AWK@ -v uid=${UID-0} '
-/^[\ \	]*(#.*)?$/ { next }
-{
-if (NF > 8) {
-    a[1]=$6
-    a[2]=$7
-    a[3]=$8
-    next
-}
-if ($1 ~ /^ftp:\/\//) {
-    if ($1 ~ /\/$/) {
-	a[4]=substr($1, 7, length($1) - 7)
-	a[5]=$1
-    } else {
-        a[4]=substr($1, 7)
-	a[5]=sprintf("%s/", $1)
-    }
-    if (NF >= 2)
-	a[4]=$2
-    else {
-        i=split(a[4], b, "/")
-        a[4]=b[1]
-        for (j = 2; j <= i; j++)
-            a[4]=sprintf("%s_%s", a[4], b[j])
-    }
-    printf "lrwxrwxrwx   1 %-8d %-8d %8d %s %2d %5s %s -> %s\n", uid, 0, length(a[5]), a[1], a[2], a[3], a[4], a[5]
-}
-}' 2>/dev/null
-}
-
-case "$1" in
-  list) mcftplistfs_list $2; exit 0;;
-esac
-exit 1
diff --git a/vfs/extfs/ucpio.in b/vfs/extfs/ucpio.in
deleted file mode 100644
index 69f4b4315..000000000
--- a/vfs/extfs/ucpio.in
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-#
-# Written by Stas Maximov 1998 SVR4 (UnixWare)
-# stmax@u213.srcc.msu.su 
-# (C) 1996 The Free Software Foundation.
-#
-#
-
-uni_cat ()
-# $1 is the archive name
-{
-    case "$1" in
-    *.cpio.Z)	compress -dc "$1"
-	;;
-    *.cpio.gz)	gzip -dc "$1"
-	;;
-    *.cpio)	cat "$1"
-	;;
-    *)		echo "unknown extension"
-    esac
-}
-
-mccpiofs_list ()
-# $1 is the archive name
-{
-    uni_cat "$1" | cpio -itv | @AWK@ '
-	{
-	    if (substr($9,length($9),1) == ",")
-	    {
-		tmp = substr($9, 1, length($9)-1);
-		$9 = $8;
-		$8 = tmp
-	    }
-	    else if (substr($10,length($10),1) == ",")
-	    {
-		tmp = substr($10, 1, length($10)-1);
-		$10 = $9
-		$9 = tmp 
-	    }
-		
-	    print $0
-	}'
-}
-
-mccpiofs_copyout ()
-# $1 is the archive name
-# $2 is a name of a file within the archive
-# $3 is a name of a file within the system (to add from or extract to)
-{
-    TMPDIR=/tmp/mctmpdir.$$
-# FIXME: Try harder to generate a unique directory if this fails
-    mkdir -m 0700 $TMPDIR || exit 1
-    cd $TMPDIR
-    uni_cat "$1" | cpio -icumd "$2" 2>/dev/null
-    mv "$2" "$3"
-    cd /
-    rm -rf $TMPDIR
-}
-
-#
-# main
-#
-    umask 077
-
-    case "$1" in
-    list)   mccpiofs_list $2
-	    exit 0
-	    ;;
-    copyout) mccpiofs_copyout $2 $3 $4
-	    exit 0
-	    ;;
-    esac
-
-    exit 1
-