diff --git a/tools/cleanup/remove_trailing_whitespaces.sh b/tools/cleanup/remove_trailing_whitespaces.sh
index 3d41284b16..cf43d833c0 100755
--- a/tools/cleanup/remove_trailing_whitespaces.sh
+++ b/tools/cleanup/remove_trailing_whitespaces.sh
@@ -7,7 +7,7 @@
 # Call ./tools/cleanup/remove_trailing_whitespaces.sh in the
 # root of openstack-manuals.
 
-files=$(find doc/src/docbkx -name *.xml -not -name pom.xml)
+files=$(find doc -name *.xml -not -name pom.xml)
 for file in $files; do
     sed -i -e 's/[[:space:]]*$//' $file
 done
diff --git a/tools/cleanup/remove_unnecessary_spaces.py b/tools/cleanup/remove_unnecessary_spaces.py
index 620dab08b1..6ed8c30844 100755
--- a/tools/cleanup/remove_unnecessary_spaces.py
+++ b/tools/cleanup/remove_unnecessary_spaces.py
@@ -10,6 +10,7 @@
 import os
 import re
 import tempfile
+import shutil
 
 # should be the same like in tools/validate.py
 FILE_EXCEPTIONS = ['ha-guide-docinfo.xml','bk001-ch003-associate-general.xml']
@@ -33,7 +34,7 @@ for element in elements:
     checks.append(re.compile("(.*<%s>)\s+([\w\-().:!?{}\[\]]+.*\n)" % element)),
     checks.append(re.compile("(.*[\w\-().:!?{}\[\]]+)\s+(<\/%s>.*\n)" % element))
 
-for root, dirs, files in os.walk('doc/src/docbkx/'):
+for root, dirs, files in os.walk('doc/'):
     for f in files:
         if (not (f.endswith('.xml') and
                  f != 'pom.xml' and
@@ -51,6 +52,5 @@ for root, dirs, files in os.walk('doc/src/docbkx/'):
             tmpfd.write(line)
         tmpfd.close()
         if match:
-            os.rename(tmpfile[1], docfile)
-        else:
-            os.unlink(tmpfile[1])
+            shutil.copyfile(tmpfile[1], docfile)
+        os.unlink(tmpfile[1])