--- a/Tools__TagList.st	Fri Nov 21 15:42:41 2014 +0100
+++ b/Tools__TagList.st	Fri Nov 21 19:15:30 2014 +0100
@@ -1706,28 +1706,40 @@
             "/ local use
             suff := (OperatingSystem isMSWINDOWSlike) ifTrue:'.exe' ifFalse:''.
 
-            ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags-5.8/ctags',suff.
+            ctagsCommand := 'ctags',suff.
             (ctagsCommand notNil and:[(fn := ctagsCommand asFilename) isExecutableProgram]) ifTrue:[
                 ctagsCommand := fn pathName.
                 ctagsIsExCtags := ctagsIsExCtags5x := true.
             ] ifFalse:[
-                ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags-3.2.2/ctags',suff.
+                ctagsCommand := 'bin/ctags',suff.
                 (ctagsCommand notNil and:[(fn := ctagsCommand asFilename) isExecutableProgram]) ifTrue:[
                     ctagsCommand := fn pathName.
-                    ctagsIsExCtags := true.
-                    ctagsIsExCtags5x := false.
+                    ctagsIsExCtags := ctagsIsExCtags5x := true.
                 ] ifFalse:[
-                    ctagsIsExCtags := nil.
-                    ctagsIsExCtags5x := nil.
-                    ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags/ctags',suff.
+                    ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags-5.8/ctags',suff.
                     (ctagsCommand notNil and:[(fn := ctagsCommand asFilename) isExecutableProgram]) ifTrue:[
                         ctagsCommand := fn pathName.
+                        ctagsIsExCtags := ctagsIsExCtags5x := true.
                     ] ifFalse:[
-                        "/ use systems default ctags command
-                        ctagsCommand := 'ctags'.
-                    ]
+                        ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags-3.2.2/ctags',suff.
+                        (ctagsCommand notNil and:[(fn := ctagsCommand asFilename) isExecutableProgram]) ifTrue:[
+                            ctagsCommand := fn pathName.
+                            ctagsIsExCtags := true.
+                            ctagsIsExCtags5x := false.
+                        ] ifFalse:[
+                            ctagsIsExCtags := nil.
+                            ctagsIsExCtags5x := nil.
+                            ctagsCommand := Smalltalk getPackageFileName:'stx/support/tools/ctags/ctags',suff.
+                            (ctagsCommand notNil and:[(fn := ctagsCommand asFilename) isExecutableProgram]) ifTrue:[
+                                ctagsCommand := fn pathName.
+                            ] ifFalse:[
+                                "/ use systems default ctags command
+                                ctagsCommand := 'ctags'.
+                            ]
+                        ]
+                    ].
                 ]
-            ].
+            ]
         ] ifFalse:[
             "/ cross-development
 "/            target remoteOperatingSystem = 'Linux' ifTrue:[
@@ -3968,14 +3980,14 @@
 !TagList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.64 2014-09-19 11:52:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.65 2014-11-21 18:15:30 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.64 2014-09-19 11:52:34 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TagList.st,v 1.65 2014-11-21 18:15:30 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__TagList.st,v 1.64 2014-09-19 11:52:34 cg Exp $'
+    ^ '$Id: Tools__TagList.st,v 1.65 2014-11-21 18:15:30 cg Exp $'
 ! !