diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac b/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac
index e5b45a9..fa7d01b 100644
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/buildbot.tac
@@ -1,13 +1,17 @@
+import os
 
 from twisted.application import service
 from buildbot.master import BuildMaster
 
-basedir = r'/var/buildbot'
+basedir = '.'
 configfile = r'master.cfg'
-rotateLength = 10000000
-maxRotatedFiles = 100
+rotateLength = 50000000
+maxRotatedFiles = 20
 umask = 022
 
+if basedir == '.':
+    basedir = os.path.abspath(os.path.dirname(__file__))
+
 application = service.Application('buildmaster')
 try:
   from twisted.python.logfile import LogFile
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index db98ad2..20e8f73 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,15 @@
 2019-10-11  Aakash Jain  <aakash_jain@apple.com>
 
+        Update build.webkit.org basedir
+        https://bugs.webkit.org/show_bug.cgi?id=202856
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/buildbot.tac: Updated basedir. Also increased the
+        size of twistd.log files and reduced number of files for easier maintenance.
+
+2019-10-11  Aakash Jain  <aakash_jain@apple.com>
+
         [ews] Services EWS should also run build.webkit.org unit tests
         https://bugs.webkit.org/show_bug.cgi?id=202864