diff --git a/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt b/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt
index 377e22d942..dd16722715 100644
--- a/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt
+++ b/contrib/infrastructure/crontab-mpiteam-at-jaguar.crest.iu.edu.txt
@@ -82,6 +82,14 @@
 1 21 * * * $HOME/scripts/hwloc-nightly-tarball.sh </dev/null >/dev/null 2>&1
 5 21 * * * $HOME/scripts/openmpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
 
+
+#######################################################################
+# Keep OMPI svn:ignore properties in sync with .gitignore_global and
+# .hgignore_global
+#######################################################################
+0 1 * * * $HOME/scripts/openmpi-nightly-githgignore.sh
+
+
 #######################################################################
 # Update web sites
 #######################################################################
@@ -122,4 +130,4 @@
 #0 0 * * * $HOME/scripts/openmpi-ft-cr-tarball.sh </dev/null >/dev/null 2>&1
 
 # Don't build any more LAM/MPI tarballs!
-#0 4 * * * $HOME/scripts/lammpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
+#0 4 * * * $HOME/scripts/lammpi-nightly-tarball.sh </dev/null >/dev/null 2>&1
\ No newline at end of file
diff --git a/contrib/nightly/openmpi-nightly-githgignore.sh b/contrib/nightly/openmpi-nightly-githgignore.sh
new file mode 100755
index 0000000000..c3b65b1d11
--- /dev/null
+++ b/contrib/nightly/openmpi-nightly-githgignore.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+#####
+#
+# Configuration options
+#
+#####
+
+# Dir for ignore SVN checkouts
+ignore_top=/u/mpiteam/openmpi/ignore-files
+
+# helper scripts dir
+script_dir=/u/mpiteam/scripts
+
+# Branches on which to build .gitignore and .hgignore
+if [ $# -eq 0 ] ; then
+    # We don't care about older than v1.6
+    #dirs="trunk branches/v1.8 branches/v1.6"
+    dirs="trunk"
+else
+    dirs=$@
+fi
+
+export PATH=$HOME/local/bin:$PATH
+export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
+
+#####
+#
+# Actually do stuff
+#
+#####
+
+doit() {
+    cmd="$*"
+    out=`eval $*`
+    if test $? -ne 0; then
+        echo command failed: $cmd
+        echo directory: `pwd`
+        exit 1
+    fi
+}
+
+# Loop making ignore files
+for dir in $dirs; do
+    cd $ignore_top/$dir
+
+    doit svn up
+    doit svnversion .
+    if test "`echo $out | egrep '[MSP:]'`"  != ""; then
+        echo Not clean SVN checkout in `pwd` -- ignored
+        exit 1
+    fi
+    doit svn st
+    if test -n "$out"; then
+        echo Not clean SVN checkout in `pwd` -- ignored
+        exit 1
+    fi
+
+    doit ./contrib/git/build-gitignore.pl --output .gitignore_global
+    doit ./contrib/hg/build-hgignore.pl --output .hgignore_global
+
+    doit svn commit -m .gitignore_global .hgignore_global -m '"Update git/hg ignore files"'
+done