diff --git a/scripts/cvs-update.sh b/scripts/git-update.sh
similarity index 59%
rename from scripts/cvs-update.sh
rename to scripts/git-update.sh
index a0437e14af..bd66745f5a 100755
--- a/scripts/cvs-update.sh
+++ b/scripts/git-update.sh
@@ -8,21 +8,48 @@
 
 FAILURE=
 
-for m in \
-  gstreamer gst-plugins-base \
-  gst-plugins-good gst-plugins-ugly gst-plugins-bad \
-  gst-ffmpeg \
-  gst-python \
-  ; do
+MODULES="\
+    gstreamer gst-plugins-base \
+    gst-plugins-good gst-plugins-ugly gst-plugins-bad \
+    gst-ffmpeg \
+    gst-python \
+    gnonlin"
+
+for m in $MODULES; do
   if test -d $m; then
+    echo "+ updating $m"
     cd $m
-    cvs update -dP
+
+    git pull origin master
+    if test $? -ne 0
+    then
+      git stash
+      git pull origin master
+      if test $? -ne 0
+      then 
+        git stash apply
+        FAILURE="$FAILURE$m: update\n"
+      else
+        git stash apply
+      fi
+      cd ..
+      continue
+    fi
+    git submodule update
     if test $? -ne 0
     then
       FAILURE="$FAILURE$m: update\n"
       cd ..
       continue
     fi
+    cd ..
+  fi
+done
+
+# then build
+for m in $MODULES; do
+  if test -d $m; then
+    cd $m
     if test ! -e Makefile
     then
       ./autoregen.sh
diff --git a/scripts/git-version.sh b/scripts/git-version.sh
new file mode 100644
index 0000000000..e92c4c50e8
--- /dev/null
+++ b/scripts/git-version.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# update all known gstreamer modules
+# build them one by one
+# report failures at the end
+# run this from a directory that contains the checkouts for each of the
+# modules
+
+FAILURE=
+
+for m in \
+  gstreamer gst-plugins-base \
+  gst-plugins-good gst-plugins-ugly gst-plugins-bad \
+  gst-ffmpeg \
+  gst-python \
+  gnonlin \
+  ; do
+  if test -d $m; then
+    cd $m
+      echo $m
+      git branch | grep '*'
+      git log | head -n 1
+    cd ..
+  fi
+done