diff --git a/ChangeLog b/ChangeLog
index c50a1fb79..5e7599bf2 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ $Source$
     * read_dump.php: Remove unused code.
     * ldi_check.php, ldi_table.php: Remove unused code.
     * tbl_change.php: Remove references to ldi_*.
+    * scripts/find_unused_messages.sh: Simplify and addapt to current
+      messages.
 
 2005-10-07 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/check_user_privileges.lib.php: bug #1313821, dbname containing a 
diff --git a/scripts/find_unused_messages.sh b/scripts/find_unused_messages.sh
index a84f12d28..7c1ca71f0 100755
--- a/scripts/find_unused_messages.sh
+++ b/scripts/find_unused_messages.sh
@@ -4,12 +4,12 @@
 
 phpfiles=`find . -type f -a -name '*.php' -a -not -path '*/lang/*'`
 
-sed -n '/^\$str/ s/\$\([^ ]*\) .*/\1/p' lang/english-iso-8859-1.inc.php \
-    | grep -v ^strTransformation_ \
+grep -o 'str[A-Z][a-zA-Z_]*' lang/english-iso-8859-1.inc.php \
+    | grep -Ev '^str(Transformation_|ShowStatus)' \
     | while read x
         do
             echo "Checking for $x" >&2
-            if [ `grep -r "\\<$x\\>" $phpfiles | wc -l` -eq 0 ] 
+            if [ `grep -r "\\<$x\\>" $phpfiles | wc -l` -eq 0 ]
             then
                 echo $x
             fi