diff --git a/src/ChangeLog b/src/ChangeLog
index 13610f3cc..536e3ceb4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2001-07-17  Pavel Roskin  <proski@gnu.org>
 
+	* util.c (get_current_wd): Remove.  It's obsoleted by
+	g_get_current_dir() from glib.
+
 	* ext.c (exec_extension): Add the `rm' command to the end of
 	temporary scripts so that they erase themselves.
 
diff --git a/src/util.c b/src/util.c
index f7ef4c457..c9ff66c49 100644
--- a/src/util.c
+++ b/src/util.c
@@ -897,29 +897,6 @@ char *strip_ctrl_codes (char *s)
 
 #endif /* VFS_STANDALONE */
 
-/*
- * Ok, on systems running glibc, getcwd does not use popen pwd on
- * Linux at least
- */
-#ifdef __GLIBC__
-#  ifdef linux
-#     undef HAVE_GETWD
-#  endif
-#endif
-
-/* getwd is better than getcwd, the later uses a popen ("pwd"); */
-char *get_current_wd (char *buffer, int size)
-{
-    char *p;
-
-#ifdef HAVE_GETWD
-    p = (char *) getwd (buffer);
-#else
-    p = getcwd (buffer, size);
-#endif
-    return p;
-}
-
 #define CHECK(x) if (x == -1) return 0;
 
 static long