diff --git a/bin/matchclasses b/bin/matchclasses
index 82e7b2e22..842c95bc3 100755
--- a/bin/matchclasses
+++ b/bin/matchclasses
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: matchclasses,v 1.2 2002/10/08 22:02:13 mdb Exp $
+# $Id: matchclasses,v 1.3 2003/07/24 21:26:40 mdb Exp $
 #
 # A script which inspects a hierarchy of classes and generates lists of
 # classes that match specified criterion. The criterion are that a class
@@ -108,7 +108,7 @@ while (@gclasses) {
 
         # interfaces are now at the end of the line
         my @ifaces;
-        if ($goods =~ s: implements (.*)$::g) {
+        if ($goods =~ s: implements ([A-Za-z0-9.\$]+)::g) {
             my $idefs = $1;
             $idefs =~ s:\s+$::g;
             $idefs =~ s:\. :\$:g;
@@ -118,7 +118,7 @@ while (@gclasses) {
 
         # now the parent class or parent interfaces are at the end
         my @parents;
-        if ($goods =~ s: extends (.*)$::g) {
+        if ($goods =~ s: extends ([A-Za-z0-9.\$]+)::g) {
             my $pdefs = $1;
             $pdefs =~ s:\s+$::g;
             $pdefs =~ s:\. :\$:g;
@@ -128,10 +128,10 @@ while (@gclasses) {
 
         # last is the class name
         my $class;
-        if ($goods =~ s: class (.*)$::g) {
+        if ($goods =~ s: class ([A-Za-z0-9.\$]+)::g) {
             $class = $1;
             $class =~ s: ::g;
-        } elsif ($goods =~ s: interface (.*)$::g) {
+        } elsif ($goods =~ s: interface ([A-Za-z0-9.\$]+)::g) {
             $class = $1;
             $class =~ s: ::g;
         }