--- a/Tools__NewSystemBrowser.st	Wed Jan 18 10:05:24 2017 +0000
+++ b/Tools__NewSystemBrowser.st	Thu Jan 19 11:52:00 2017 +0000
@@ -36584,8 +36584,13 @@
      tempStream changeSet labels values answer
      keyFileGeneratorClass browseFile|
 
+    stxPatchesDir := 'stxPatches' asFilename.
+    stxPatchesDir exists ifFalse:[
+        stxPatchesDir recursiveMakeDirectory.
+    ].
+
     "/ find the highest numbered patchfile
-    fileNamePrefix := self nextPatchNumberIn:'stxPatches' asFilename.
+    fileNamePrefix := self nextPatchNumberIn:stxPatchesDir.
 
     changedClassesAndMetaclasses := diffSet changedClasses.
     changedClasses := changedClassesAndMetaclasses collect:[:clsOrMeta | clsOrMeta theNonMetaclass].
@@ -36602,18 +36607,13 @@
     fileNameMiddle := (fileNameMiddle asFilename makeLegalFilename withSuffix:'chg') name.
     fileName := fileNamePrefix, '_', fileNameMiddle.
 
-    stxPatchesDir := 'stxPatches' asFilename.
-    stxPatchesDir exists ifFalse:[
-        stxPatchesDir recursiveMakeDirectory.
-    ].
-
-    tempStream := FileStream newTemporaryIn:'stxPatches'.
+    tempStream := FileStream newTemporaryIn:stxPatchesDir.
     tempStream nextPutLine:('"/ patches to bring %1 to version %2' bindWith:changedClasses first name with:thisRevString).
     tempStream nextPutLine:('"/').
     tempStream nextPutLine:('"/ first, a guard, to ignore the patch if the library already contains an up-to-date class:').
     tempStream nextPutLine:('"/').
     changedOwningClasses do:[:eachClass |
-        tempStream nextPutLine:('(Smalltalk classNamed:''%2'') isNil ifTrue:[InvalidPatchError raiseErrorString:''patch is for non-existent class %2 (probably for a plugin that is not installed)'']. 
+        tempStream nextPutLine:('(Smalltalk classNamed:''%2'') isNil ifTrue:[InvalidPatchError raiseErrorString:''patch is for non-existent class %2 (probably for a plugin that is not installed)''].
 (''%1'' compareAsVersionNumberWith:%2 revision) < 0 ifTrue:[ InvalidPatchError raiseErrorString:''patch is for older version (%1) of class %2'' ].'
                             bindWith:eachClass revision
                             with:eachClass name).
@@ -36626,7 +36626,7 @@
     changeSet fileOutOn:tempStream.
     tempStream syncData; close.
 
-    generatedPatchFilename := ('stxPatches' asFilename construct:fileName).
+    generatedPatchFilename := (stxPatchesDir construct:fileName).
 
     tempStream fileName renameTo:generatedPatchFilename.
     browseFile := false.