diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 15229b7c..332a07a2 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -95,12 +95,15 @@ c['schedulers'].append( SingleBranchScheduler(
                             builderNames=["build-win32-py27",
                                           "build-win32-py34",
                                           "build-win32-py35",
+                                          "build-win32-py36",
                                           "build-win64-py27",
                                           "build-win64-py34",
                                           "build-win64-py35",
+                                          "build-win64-py36",
                                           "build-osx-py27",
                                           "build-osx-py34",
                                           "build-osx-py35",
+                                          "build-osx-py36",
                                           "build-gtk-py27",
                                           "build-gtk-py34",
                                           "build-gtk-py35",
@@ -118,12 +121,15 @@ c['schedulers'].append( Nightly(
                             builderNames=["dist-osx-py27",
                                           "dist-osx-py34",
                                           "dist-osx-py35",
+                                          "dist-osx-py36",
                                           "dist-win32-py27",
                                           "dist-win32-py34",
                                           "dist-win32-py35",
+                                          "dist-win32-py36",
                                           "dist-win64-py27",
                                           "dist-win64-py34",
                                           "dist-win64-py35",
+                                          "dist-win64-py36",
                                           ]))
 
 
@@ -153,12 +159,15 @@ c['schedulers'].append( ForceScheduler(
                             builderNames=["build-win32-py27",
                                           "build-win32-py34",
                                           "build-win32-py35",
+                                          "build-win32-py36",
                                           "build-win64-py27",
                                           "build-win64-py34",
                                           "build-win64-py35",
+                                          "build-win64-py36",
                                           "build-osx-py27",
                                           "build-osx-py34",
                                           "build-osx-py35",
+                                          "build-osx-py36",
                                           "build-gtk-py27",
                                           "build-gtk-py34",
                                           "build-gtk-py35",
@@ -168,12 +177,15 @@ c['schedulers'].append( ForceScheduler(
                                           "dist-osx-py27",
                                           "dist-osx-py34",
                                           "dist-osx-py35",
+                                          "dist-osx-py36",
                                           "dist-win32-py27",
                                           "dist-win32-py34",
                                           "dist-win32-py35",
+                                          "dist-win32-py36",
                                           "dist-win64-py27",
                                           "dist-win64-py34",
                                           "dist-win64-py35",
+                                          "dist-win64-py36",
                                           "bdist-docs",
                                           "bdist-src",
                                           #"vagrant-bldr",
@@ -296,6 +308,10 @@ c['builders'] = [
                       slavenames=["macosx-vm4"],
                       factory=makeFactory('osx', pyVer='3.5')),
 
+        BuilderConfig(name="build-osx-py36",
+                      slavenames=["macosx-vm4"],
+                      factory=makeFactory('osx', pyVer='3.6')),
+
 
 
 
@@ -311,6 +327,10 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win32', pyVer='3.5')),
 
+        BuilderConfig(name="build-win32-py36",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win32', pyVer='3.6')),
+
         BuilderConfig(name="build-win64-py27",
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', pyVer='2.7')),
@@ -323,6 +343,10 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', pyVer='3.5')),
 
+        BuilderConfig(name="build-win64-py36",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win64', pyVer='3.6')),
+
 
 
         BuilderConfig(name="build-gtk-py27",
@@ -372,6 +396,10 @@ c['builders'] = [
             slavenames=["macosx-vm4"],
             factory=makeFactory('osx', 'dist', pyVer='3.5')),
 
+        BuilderConfig(name="dist-osx-py36",
+            slavenames=["macosx-vm4"],
+            factory=makeFactory('osx', 'dist', pyVer='3.6')),
+
 
         BuilderConfig(name="dist-win32-py27",
                       slavenames=["win7-py27"],
@@ -385,6 +413,10 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win32', 'dist', pyVer='3.5')),
 
+        BuilderConfig(name="dist-win32-py36",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win32', 'dist', pyVer='3.6')),
+
         BuilderConfig(name="dist-win64-py27",
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', 'dist', pyVer='2.7')),
@@ -397,6 +429,10 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', 'dist', pyVer='3.5')),
 
+        BuilderConfig(name="dist-win64-py36",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win64', 'dist', pyVer='3.6')),
+
 
         # BuilderConfig(name="vagrant-bldr",
         #               slavenames=["vagrant-bldr"],