diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 034951775e96bdcca6ff674157b6ffb50bbb0cb2..50d24feb9c41f83037ae974a18c35405baec2e64 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-13  Phil Edwards  <phil@codesourcery.com>
+
+	* docs/doxygen/run_doxygen:  Clear GENERATE_TAGFILE entirely
+	if man pages are on.
+	* docs/doxygen/user.cfg.in:  And here.
+
 2003-09-10  Daniel Jacobowitz  <drow@mvista.com>
 	    Andreas Jaeger <aj@suse.de>
 
diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
index c1ae3cb5852e6ff7d85390457e7979d7d2957470..a04c7e7bfbf8a04d953066c03183a87e6abd7654 100644
--- a/libstdc++-v3/docs/doxygen/run_doxygen
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -98,6 +98,7 @@ outdir=unset
 do_html=false
 do_man=false
 enabled_sections=
+generate_tagfile=
 DATEtext=`date '+%Y-%m-%d'`
 
 parse_options $*
@@ -110,15 +111,20 @@ if test $srcdir = unset || test $outdir = unset || test $mode = unset; then
 fi
 
 case x"$mode" in
-    xuser)           do_html=true
-                     LEVELtext='User'
-                     ;;
-    xmaint)          do_html=true
-                     enabled_sections=maint
-                     LEVELtext='Maintainer'
-                     ;;
-    xman)            do_man=true
-                     ;;
+    xuser)
+      do_html=true
+      LEVELtext='User'
+      generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+      ;;
+    xmaint)
+      do_html=true
+      enabled_sections=maint
+      LEVELtext='Maintainer'
+      generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+      ;;
+    xman)
+      do_man=true
+      ;;
     *)
       echo run_doxygen error:  $mode is an invalid mode 1>&2
       exit 1 ;;
@@ -143,6 +149,7 @@ fi
       -e "s=@enabled_sections@=${enabled_sections}=" \
       -e "s=@do_html@=${do_html}=" \
       -e "s=@do_man@=${do_man}=" \
+      -e "s=@generate_tagfile@=${generate_tagfile}=" \
       ${srcdir}/docs/doxygen/user.cfg.in > ${outdir}/${mode}.cfg
   echo :: NOTE that this may take some time...
   echo doxygen ${outdir}/${mode}.cfg
diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in
index 87653ebe512f85bc16fe6a70214f39653346a571..e606060b3c085b2308a93448159747f7b52c6125 100644
--- a/libstdc++-v3/docs/doxygen/user.cfg.in
+++ b/libstdc++-v3/docs/doxygen/user.cfg.in
@@ -902,7 +902,7 @@ TAGFILES               =
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = @outdir@/@html_output_dir@/libstdc++.tag
+GENERATE_TAGFILE       = @generate_tagfile@
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes