diff --git a/bin/foamEbrowse b/bin/foamEbrowse
index 66fafc1e2b1b46f5384ca1c78f309fb1b785559d..365d0fa60590433b2986606a63616f6eb68c4169 100755
--- a/bin/foamEbrowse
+++ b/bin/foamEbrowse
@@ -47,7 +47,7 @@ cd $WM_PROJECT_DIR
 mkdir .tags 2>/dev/null
 cd .tags
 
-find -H .. \( -name "*.[HC]" -not -name "lnInclude" -not -name "Doxygen" \) -print > $sourcesFile
+find -H .. \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) -print > $sourcesFile
 ebrowse --files=$sourcesFile --output-file=ebrowse
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamTags b/bin/foamTags
index 1cfd186f52b1b32e1d9d8c77fce0d44e5218d507..f51e06a0623ad79122ef72b61f3f40a2cb3296c3 100755
--- a/bin/foamTags
+++ b/bin/foamTags
@@ -42,15 +42,24 @@ fi
 cd $WM_PROJECT_DIR
 mkdir .tags 2>/dev/null
 
-find -H . \( -name "*.[HC]" -not -name "lnInclude" -not -name "Doxygen" \) | \
-    etags --declarations -l c++ -o .tags/etags -
-find -H . \( -name "*.[HC]" -not -name "lnInclude" -not -name "Doxygen" \) | \
-    etags -l c++ -o .tags/etagsDef -
-find -H . \( -name "*.H" -not -name "lnInclude" -not -name "Doxygen" \) | \
-    etags --declarations -l c++ -o .tags/etagsDec -
+#etagsCmd="etags --declarations -l c++ -o .tags/etags -"
+#etagsDefCmd="etags -l c++ -o .tags/etagsDef -"
+#etagsDecCmd="etags --declarations -l c++ -o .tags/etagsDec -"
+
+etagsCmd="ectags -e --extra=+fq --file-scope=no --c-kinds=+p -o .tags/etags -L -"
+etagsDefCmd="ectags -e --extra=+fq --file-scope=no -o .tags/etagsDef -L -"
+etagsDecCmd="ectags -e --extra=+fq --file-scope=no --c-kinds=+p -o .tags/etagsDec -L -"
+
+ectagsDecCmd="ectags -o .tags/ectagsDec --file-scope=no --c-kinds=+p --excmd=n --extra=+fq --fields=+afiKmnsSzt -L -"
+
+find -H . \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsCmd
+find -H . \( -name "*.[HC]" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDefCmd
+find -H . \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $etagsDecCmd
+find -H . \( -name "*.H" -o -name lnInclude -prune -o -name Doxygen -prune \) | $ectagsDecCmd
 
 gtags -i --gtagsconf bin/tools/gtagsrc .tags
 
 foamEbrowse
 
+
 #------------------------------------------------------------------------------