diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index ca00d9934..65ab33bee 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-19  Pavel Roskin  <proski@gnu.org>
+
+	* local.c (local_telldir): Warn and abort if telldir() is not
+	available.
+	(local_seekdir): Warn and abort if seekdir() is not available.
+
 2001-06-18  Pavel Roskin  <proski@gnu.org>
 
 	* tcputil.c (sig_pipe): Use the same declaration with one int
diff --git a/vfs/local.c b/vfs/local.c
index 2ad2a36c7..32ef435f9 100644
--- a/vfs/local.c
+++ b/vfs/local.c
@@ -91,13 +91,24 @@ local_opendir (vfs *me, char *dirname)
 static int
 local_telldir (void *data)
 {
+#ifdef HAVE_TELLDIR
     return telldir( *(DIR **) data );
+#else
+ #warning "Native telldir() not available, emulation not implemented"
+    abort();
+    return 0; /* for dumb compilers */
+#endif /* !HAVE_TELLDIR */
 }
 
 static void
 local_seekdir (void *data, int offset)
 {
+#ifdef HAVE_SEEKDIR
     seekdir( *(DIR **) data, offset );
+#else
+ #warning "Native seekdir() not available, emulation not implemented"
+    abort();
+#endif /* !HAVE_SEEKDIR */
 }
 
 static void *