diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
index 4ad5212..cf7752b 100644
--- a/buildbot/master/master.cfg
+++ b/buildbot/master/master.cfg
@@ -42,6 +42,10 @@ c['slaves'] = [
     buildslave.BuildSlave('osx-10.12', secrets['osx-10.12'],
                           max_builds=1,
                           properties={'platform': 'osx-10.12'}),
+    buildslave.BuildSlave('dragonfly-4.6', secrets['dragonfly-4.6'],
+                          max_builds=1,
+                          properties={'platform': 'dragonfly-4.6'}),
+
 ]
 
 c['protocols'] = {'pb': {'port': 9989}}
@@ -91,24 +95,24 @@ from buildbot.plugins import schedulers
 
 c['schedulers'].append(schedulers.ForceScheduler(
                             name='force',
-                            builderNames=['monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12']))
+                            builderNames=['kovri-static-dragonflybsd-amd64', 'kovri-all-dragonflybsd-amd64', 'monero-snap','monero-core-android-armv7','monero-static-dragonflybsd-amd64','monero-static-netbsd-amd64','monero-static-openbsd-amd64','monero-android-armv7','kovri-static-win32','kovri-static-win64','kovri-static-freebsd64','kovri-static-osx','kovri-static-ubuntu-amd64','kovri-static-ubuntu-i686','kovri-static-ubuntu-arm7','kovri-static-debian-arm8','pigeons-testing','monero-tests-ubuntu-16.04-i686','monero-tests-windows-10-i686','monero-tests-freebsd-10.3-amd64','monero-tests-ubuntu-16.04-amd64','monero-tests-osx-10.11','monero-tests-osx-10.10','monero-tests-osx-10.12','monero-tests-ubuntu-16.04-armv7','monero-tests-debian-armv8','monero-tests-windows-10-amd64','monero-core-win32','monero-core-win64','monero-core-freebsd','monero-core-ubuntu-arm7','monero-core-debian-armv8','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-arm7','kovri-all-ubuntu-i686','kovri-all-win32','kovri-all-win64','kovri-all-debian-arm8','kovri-all-ubuntu-amd64','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-amd64','monero-core-ubuntu-i686','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-win32','monero-static-win64','monero-static-ubuntu-amd64','monero-static-freebsd64','monero-static-ubuntu-arm7','monero-static-debian-armv8','monero-static-ubuntu-i686','monero-static-osx-10.12']))
 
 c['schedulers'].append(schedulers.SingleBranchScheduler(
             name='monero PR builder',
-            builderNames=['monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'],
+            builderNames=['monero-static-dragonflybsd-amd64','monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'],
             change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git')
             ))
 
 c['schedulers'].append(schedulers.SingleBranchScheduler(
             name='monero-core PR builder',
-            builderNames=['monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-i686','monero-core-ubuntu-amd64','monero-core-win32','monero-core-win64','monero-core-ubuntu-arm7'],
+            builderNames=['monero-core-freebsd','monero-core-osx-10.12','monero-core-osx-10.11','monero-core-ubuntu-i686','monero-core-ubuntu-amd64','monero-core-win32','monero-core-win64','monero-core-ubuntu-arm7','monero-core-debian-armv8'],
             change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero-core.git')
             ))
 
 c['schedulers'].append(schedulers.SingleBranchScheduler(
             name='kovri PR builder',
             fileIsImportant=startCompile,
-            builderNames=['kovri-all-win32','kovri-all-win64','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-amd64','kovri-all-ubuntu-i686','kovri-all-ubuntu-arm7','kovri-all-debian-arm8'],
+            builderNames=['kovri-all-dragonflybsd-amd64', 'kovri-all-win32','kovri-all-win64','kovri-all-freebsd64','kovri-all-osx-10.12','kovri-all-osx-10.10','kovri-all-osx-10.11','kovri-all-ubuntu-amd64','kovri-all-ubuntu-i686','kovri-all-ubuntu-arm7','kovri-all-debian-arm8'],
             change_filter=util.ChangeFilter(repository='https://github.com/monero-project/kovri.git')
             ))
 
@@ -121,6 +125,25 @@ c['schedulers'].append(schedulers.Nightly(
                        change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git'),
 		       onlyIfChanged=True))
 
+c['schedulers'].append(schedulers.Nightly(
+                       name='Kovri Nightly',
+                       branch='master',
+                       builderNames=['kovri-static-dragonflybsd-amd64','kovri-static-win32','kovri-static-win64','kovri-static-freebsd64','kovri-static-osx','kovri-static-ubuntu-amd64','kovri-static-ubuntu-i686','kovri-static-ubuntu-arm7','kovri-static-debian-arm8'],
+                       hour=6, 
+                       minute=0,
+                       change_filter=util.ChangeFilter(repository='https://github.com/monero-project/kovri.git'),
+                       onlyIfChanged=False))
+
+c['schedulers'].append(schedulers.Nightly(
+                       name='Monero Nightly',
+                       branch='master',
+                       builderNames=['monero-static-dragonflybsd-amd64','monero-static-win32','monero-static-win64','monero-static-osx-10.10','monero-static-osx-10.11','monero-static-osx-10.12','monero-static-freebsd64','monero-static-debian-armv8','monero-static-ubuntu-arm7','monero-static-ubuntu-amd64','monero-static-ubuntu-i686'],
+                       hour=7, 
+                       minute=0,
+                       change_filter=util.ChangeFilter(repository='https://github.com/monero-project/monero.git'),
+                       onlyIfChanged=False))
+
+
 # thanks m-labs https://github.com/m-labs/buildbot-config/blob/master/master.cfg
 def addCoverallsUploadSteps(factory, repo_token):
     factory.addStep(
@@ -203,6 +226,14 @@ win64ReleaseFactory.addStep(steps.SetPropertyFromCommand(name = "set version", c
 win64ReleaseFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] ))
 win64ReleaseFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-%(gitversion)s-%(platform)s.tar.gz")))
 
+dragonflyFactory = util.BuildFactory()
+dragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero.git', mode='full'))
+dragonflyFactory.addStep(steps.Compile(command = ['gmake', 'release-static'], env={'LDVER': 'ld.bfd'}))
+dragonflyFactory.addStep(steps.Test(command = ['gmake', 'release-test'], timeout=None, env={'LDVER': 'ld.bfd', 'ARGS': " -E 'coretests|libwallet_api_tests' "}, logfiles={'LastTest': 'build/release/Testing/Temporary/LastTest.log','CTestCostData.txt': 'build/release/Testing/Temporary/CTestCostData.txt'}))
+dragonflyFactory.addStep(steps.SetPropertyFromCommand(name = "set version", command = ["git", "rev-parse", "--short", "HEAD"], property = 'gitversion'))
+dragonflyFactory.addStep(steps.ShellCommand(name = "zip", command = ["tar", "-zcvf", WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), "build/release/bin"] ))
+dragonflyFactory.addStep(steps.FileUpload(slavesrc=WithProperties("monero-%(gitversion)s-%(platform)s.tar.gz"), masterdest=WithProperties("/home/buildbot/master/public_html/downloads/monero-%(gitversion)s-%(platform)s.tar.gz"), url=WithProperties("https://build.getmonero.org/downloads/monero-%(gitversion)s-%(platform)s.tar.gz")))
+
 coreFactory = util.BuildFactory()
 coreFactory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full'))
 coreFactory.addStep(steps.Compile(command = ["bash", "-ex", "build.sh"], timeout=None))
@@ -286,6 +317,17 @@ kovriMingw64Factory.addStep(steps.Compile(name="compile tests", command=["make",
 kovriMingw64Factory.addStep(steps.Test(command=["kovri-tests.exe"], workdir="build/build"))
 kovriMingw64Factory.addStep(steps.Test(name="banchmark", command=["kovri-benchmarks.exe"], workdir="build/build"))
 
+kovriDragonflyFactory = util.BuildFactory()
+kovriDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
+kovriDragonflyFactory.addStep(steps.Compile(command=["gmake", "all-options"]))
+kovriDragonflyFactory.addStep(steps.Compile(name="compile tests", command=["gmake", "tests"]))
+kovriDragonflyFactory.addStep(steps.Test(command=["./build/kovri-tests"]))
+kovriDragonflyFactory.addStep(steps.Test(name="benchmark", command=["./build/kovri-benchmarks"]))
+
+kovriStaticDragonflyFactory = util.BuildFactory()
+kovriStaticDragonflyFactory.addStep(steps.Git(repourl='https://github.com/monero-project/kovri.git', mode='full', submodules=True))
+kovriStaticDragonflyFactory.addStep(steps.Compile(command=["gmake", "release-static"]))
+
 coreUbuntu64Factory = util.BuildFactory()
 coreUbuntu64Factory.addStep(steps.Git(repourl='https://github.com/monero-project/monero-core.git', mode='full'))
 coreUbuntu64Factory.addStep(steps.Compile(command = ["bash", "-ex", "./build.sh"], env={'PATH': '/opt/Qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'}))
@@ -393,6 +435,15 @@ c['builders'].append(
         "github_repo_name": "monero",
     }))
 
+c['builders'].append(
+    util.BuilderConfig(name="monero-static-dragonflybsd-amd64",
+      slavenames=["dragonfly-4.6"],
+      factory=dragonflyFactory,
+      properties={
+        "github_repo_owner": "monero-project",
+        "github_repo_name": "monero",
+    }))
+
 c['builders'].append(
     util.BuilderConfig(name="monero-static-osx-10.12",
       slavenames=["osx-10.12"],
@@ -583,6 +634,15 @@ c['builders'].append(
         "github_repo_name": "kovri",
     }))
 
+c['builders'].append(
+    util.BuilderConfig(name="kovri-all-dragonflybsd-amd64",
+      slavenames=["dragonfly-4.6"],
+      factory=kovriDragonflyFactory,
+      properties={
+        "github_repo_owner": "monero-project",
+        "github_repo_name": "kovri",
+    }))
+
 c['builders'].append(
     util.BuilderConfig(name="kovri-all-win32",
       slavenames=["win32"],
@@ -601,6 +661,11 @@ c['builders'].append(
         "github_repo_name": "kovri",
     }))
 
+c['builders'].append(
+    util.BuilderConfig(name="kovri-static-dragonflybsd-amd64",
+      slavenames=["dragonfly-4.6"],
+      factory=kovriStaticDragonflyFactory))
+
 c['builders'].append(
     util.BuilderConfig(name="monero-tests-ubuntu-16.04-i686",
       slavenames=["linux-i386"],