--- src/man-getopt.c.orig	Sat Oct 23 05:38:46 2004
+++ src/man-getopt.c	Sat Oct 23 06:17:04 2004
@@ -39,7 +39,7 @@
      exit(1);
 }
 
-static char short_opts[] = "B:C:H:xM:P:S:acdDfFhkKm:p:s:tvVwW?";
+static char short_opts[] = "B:C:H:xM:P:S:acdDfFhkKm:p:s:tvVwW?Lq";
 
 #ifndef NOGETOPT
 #undef _GNU_SOURCE
@@ -167,6 +167,11 @@
 		    fatal (INCOMPAT, "-w", "-t");
 	       print_where++;
 	       break;
+	  /* Silently ignore manpath -q and -L (3825529). */
+	  case 'L':
+	  case 'q':
+	       if (!strncmp(progname, "manpath", 7))
+		    break;
 	  case 'h':
 	  case '?':
 	  default: