diff --git a/.gitignore b/.gitignore
index 8de178a605..f567511db3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,9 @@ doc/[Dd]oxygen/latex
 doc/[Dd]oxygen/man
 
 # generated files in the main directory (e.g. ReleaseNotes-?.?.html)
+# and in the doc directory
 /*.html
+/doc/*.html
 
 # source packages - anywhere
 *.tar.bz2
diff --git a/bin/tools/org-batch b/bin/tools/org-batch
new file mode 100755
index 0000000000..809552b54f
--- /dev/null
+++ b/bin/tools/org-batch
@@ -0,0 +1,108 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     org-batch
+#
+# Description
+#     Batch process emacs org-mode files to create html/LaTeX etc.
+#
+#------------------------------------------------------------------------------
+Script=${0##*/}
+
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTIONS] file1 [.. fileN]
+options:
+  -html   create html (default)
+  -latex  create LaTeX
+
+* Batch process emacs org-mode files to create html/LaTeX etc.
+
+USAGE
+    exit 1
+}
+
+
+# default is html export:
+mode=html
+
+case $Script in
+*latex)
+    mode=latex
+    ;;
+*html)
+    mode=html
+    ;;
+esac
+
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -html)
+        mode=html
+        shift
+        ;;
+    -latex)
+        mode=latex
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+# default is the current directory
+[ "$#" -gt 0 ] || usage "No files specified"
+
+type emacs >/dev/null 2>&1 || usage "No emacs found in PATH"
+
+
+for org
+do
+    echo "Processing: $org"
+    echo "----------"
+    if [ -f "$org" ]
+    then
+        emacs --batch -l org --visit=$org \
+              --funcall org-export-as-$mode-batch
+    else
+        echo "File not found"
+    fi
+    echo "----------"
+done
+
+#------------------------------------------------------------------------------
diff --git a/bin/tools/org-html b/bin/tools/org-html
new file mode 120000
index 0000000000..3c8e28ed2e
--- /dev/null
+++ b/bin/tools/org-html
@@ -0,0 +1 @@
+org-batch
\ No newline at end of file
diff --git a/bin/tools/org-latex b/bin/tools/org-latex
new file mode 120000
index 0000000000..3c8e28ed2e
--- /dev/null
+++ b/bin/tools/org-latex
@@ -0,0 +1 @@
+org-batch
\ No newline at end of file