diff --git a/data/cgi/cvsweb.cgi b/data/cgi/cvsweb.cgi
index 40ab24174e..81a3ccec17 100755
--- a/data/cgi/cvsweb.cgi
+++ b/data/cgi/cvsweb.cgi
@@ -174,7 +174,8 @@ if (-d $fullname) {
 	    if ($_ eq '.') {
 		next;
 	    }
-	    next if $_ eq '#cvs.lock';
+	    # ignore CVS lock and stale NFS files
+	    next if /^#cvs\.|^,|^\.nfs/;
 
 	    if (s|^Attic/||) {
 		$attic = " (in the Attic)";
diff --git a/en/cgi/cvsweb.cgi b/en/cgi/cvsweb.cgi
index 40ab24174e..81a3ccec17 100755
--- a/en/cgi/cvsweb.cgi
+++ b/en/cgi/cvsweb.cgi
@@ -174,7 +174,8 @@ if (-d $fullname) {
 	    if ($_ eq '.') {
 		next;
 	    }
-	    next if $_ eq '#cvs.lock';
+	    # ignore CVS lock and stale NFS files
+	    next if /^#cvs\.|^,|^\.nfs/;
 
 	    if (s|^Attic/||) {
 		$attic = " (in the Attic)";