diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh
new file mode 100755
index 0000000..3977571
--- /dev/null
+++ b/generate-blob-lists.sh
@@ -0,0 +1,131 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2010 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script auto-generates the lists of proprietary blobs necessary to build
+# the Android Open-Source Project code for a variety of hardware targets.
+
+# It needs to be run from the root of a source tree that can repo sync,
+# runs builds with and without the vendor tree, and uses the difference
+# to generate the lists.
+
+# It can optionally upload the results to a Gerrit server for review.
+
+# WARNING: It destroys the source tree. Don't leave anything precious there.
+
+# Caveat: this script does many full builds (2 per device). It takes a while
+# to run. It's best # suited for overnight runs on multi-CPU machines
+# with a lot of RAM.
+
+# Syntax: device/common/generate-blob-lists.sh -f|--force [<server> <branch>]
+#
+# If the server and branch paramters are both present, the script will upload
+# new files (if there's been any change) to the mentioned Gerrit server,
+# in the specified branch.
+
+if test "$1" != "-f" -a "$1" != "--force"
+then
+  echo This script must be run with the --force option
+  exit 1
+fi
+shift
+
+DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro"
+export LC_ALL=C
+
+repo sync
+repo sync
+repo sync
+
+ARCHIVEDIR=archive-$(date +%s)
+if test -d archive-ref
+then
+  cp -R archive-ref $ARCHIVEDIR
+else
+  mkdir $ARCHIVEDIR
+
+  . build/envsetup.sh
+  for DEVICENAME in $DEVICES
+  do
+    rm -rf out
+    lunch full_$DEVICENAME-user
+    make -j32
+    cat out/target/product/$DEVICENAME/installed-files.txt |
+      cut -b 15- |
+      sort -f > $ARCHIVEDIR/$DEVICENAME-with.txt
+  done
+  rm -rf vendor
+  for DEVICENAME in $DEVICES
+  do
+    rm -rf out
+    lunch full_$DEVICENAME-user
+    make -j32
+    cat out/target/product/$DEVICENAME/installed-files.txt |
+      cut -b 15- |
+      sort -f > $ARCHIVEDIR/$DEVICENAME-without.txt
+  done
+fi
+
+for DEVICENAME in $DEVICES
+do
+  if test $(wc -l < $ARCHIVEDIR/$DEVICENAME-without.txt) != 0 -a $(wc -l < $ARCHIVEDIR/$DEVICENAME-with.txt) != 0
+  then
+    MANUFACTURERNAME=$( find device -type d | grep [^/]\*/[^/]\*/$DEVICENAME\$ | cut -f 2 -d / )
+    (
+      echo '# Copyright (C) 2011 The Android Open Source Project'
+      echo '#'
+      echo '# Licensed under the Apache License, Version 2.0 (the "License");'
+      echo '# you may not use this file except in compliance with the License.'
+      echo '# You may obtain a copy of the License at'
+      echo '#'
+      echo '#      http://www.apache.org/licenses/LICENSE-2.0'
+      echo '#'
+      echo '# Unless required by applicable law or agreed to in writing, software'
+      echo '# distributed under the License is distributed on an "AS IS" BASIS,'
+      echo '# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.'
+      echo '# See the License for the specific language governing permissions and'
+      echo '# limitations under the License.'
+      echo
+      echo '# This file is generated by device/common/generate-blob-lists.sh - DO NOT EDIT'
+      echo
+      diff $ARCHIVEDIR/$DEVICENAME-without.txt $ARCHIVEDIR/$DEVICENAME-with.txt |
+        grep -v '\.odex$' |
+        grep '>' |
+        cut -b 3-
+    ) > $ARCHIVEDIR/$DEVICENAME-proprietary-blobs.txt
+    cp $ARCHIVEDIR/$DEVICENAME-proprietary-blobs.txt device/$MANUFACTURERNAME/$DEVICENAME/proprietary-blobs.txt
+
+    (
+      cd device/$MANUFACTURERNAME/$DEVICENAME
+      git add .
+      git commit -m "$(echo -e 'auto-generated blob list\n\nBug: 4295425')"
+      if test "$1" != "" -a "$2" != ""
+      then
+        echo uploading to server $1 branch $2
+        git push ssh://$1:29418/device/$MANUFACTURERNAME/$DEVICENAME.git HEAD:refs/for/$2/autoblobs
+      fi
+    )
+  fi
+done
+
+if ! test -d archive-ref
+then
+  echo * device/* |
+    tr \  \\n |
+    grep -v ^archive- |
+    grep -v ^device$ |
+    grep -v ^device/common$ |
+    xargs rm -rf
+fi