diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index f1915c230782696a50086356cc51f34c7dbfb58c..00772d87009e82defd061da92f8dfcb3f99ee239 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-01  Arnaud Charlet  <charlet@adacore.com>
+
+	* update_web_docs_svn: Simplify build of gnat_ugn.
+
 2014-06-12  Richard Biener  <rguenther@suse.de>
 
 	* crontab: Remove 4.7 snapshot entry.
diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn
index 8a5883eeca7e04ddf48650e0087dbb2938a31083..c66122068bf71d0434446917a7e4dce38248bea9 100755
--- a/maintainer-scripts/update_web_docs_svn
+++ b/maintainer-scripts/update_web_docs_svn
@@ -20,11 +20,7 @@ MANUALS="cpp
   gcj
   gfortran
   gfc-internals
-  gnat_ug_unx
-  gnat_ug_vms
-  gnat_ug_vxw
-  gnat_ug_wnt
-  gnat_ugn_unw
+  gnat_ugn
   gnat-style
   gnat_rm
   libgomp
@@ -118,8 +114,6 @@ fi
 find gcc -type f \( -name '*.texi' \
   -o -path gcc/gcc/doc/install.texi2html \
   -o -path gcc/gcc/doc/include/texinfo.tex \
-  -o -path gcc/gcc/ada/xgnatugn.adb \
-  -o -path gcc/gcc/ada/ug_words \
   -o -path gcc/gcc/BASE-VER \
   -o -path gcc/gcc/DEV-PHASE \
   -o -print0 \) | xargs -0 rm -f
@@ -131,14 +125,6 @@ tar cf docs-sources.tar gcc
 # and fdl.texi.
 includedir=gcc/gcc/doc/include
 
-# Generate gnat_ugn_unw
-
-if [ -f gcc/gcc/ada/xgnatugn.adb ]; then
-   gnatmake -q gcc/gcc/ada/xgnatugn
-   ./xgnatugn unw gcc/gcc/ada/gnat_ugn.texi \
-     gcc/gcc/ada/ug_words gnat_ugn_unw.texi
-fi
-
 # Generate gcc-vers.texi.
 (
    echo "@set version-GCC $(cat gcc/gcc/BASE-VER)"
@@ -161,7 +147,7 @@ for file in $MANUALS; do
   filename=`find . -name ${file}.texi`
   if [ "${filename}" ]; then
     includes="-I ${includedir} -I `dirname ${filename}`"
-    if [ "$file" = "gnat_ugn_unw" ]; then
+    if [ "$file" = "gnat_ugn" ]; then
       includes="$includes -I gcc/gcc/ada"
     fi
     makeinfo --html $includes -o ${file} ${filename}