diff --git a/HISTORY.rst b/HISTORY.rst
index ab3a3500..e024d821 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ PlatformIO 2.0
 2.9.2 (2016-??-??)
 ~~~~~~~~~~~~~~~~~~
 
+* Added support for MightyCore ATmega8535 board
+  (`issue #585 <https://github.com/platformio/platformio/issues/585>`_)
 * Use HTTP mirror for Package Manager in a case with SSL errors
   (`issue #645 <https://github.com/platformio/platformio/issues/645>`_)
 * Fixed bug with ``env_default`` when ``pio run -e`` is used
diff --git a/platformio/boards/microchippic32.json b/platformio/boards/microchippic32.json
index a118c8e0..b5a949be 100644
--- a/platformio/boards/microchippic32.json
+++ b/platformio/boards/microchippic32.json
@@ -561,7 +561,7 @@
             "variant": "OpenBCI"
         },
         "frameworks": ["arduino"],
-        "name": "Digilent OpenScope",
+        "name": "OpenBCI 32bit",
         "platform": "microchippic32",
         "upload": {
             "maximum_ram_size": 32768,
@@ -571,7 +571,7 @@
             "speed": 115200,
             "wait_for_upload_port": true
         },
-        "url": "http://store.digilentinc.com/",
-        "vendor": "Digilent"
+        "url": "http://shop.openbci.com/",
+        "vendor": "OpenBCI"
     }
 }
diff --git a/platformio/boards/mightycore.json b/platformio/boards/mightycore.json
index 88730431..7ee7913f 100644
--- a/platformio/boards/mightycore.json
+++ b/platformio/boards/mightycore.json
@@ -129,5 +129,27 @@
         },
         "url": "https://www.tindie.com/products/MCUdude/dip-40-arduino-compatible-development-board",
         "vendor": "Mcudude"
+    },
+
+    "mightycore8535": {
+        "build": {
+            "core": "MightyCore",
+            "extra_flags": "-DARDUINO_ARCH_AVR -DARDUINO_AVR_ATmega8535",
+            "f_cpu": "16000000L",
+            "mcu": "atmega16",
+            "variant": "mightycore"
+        },
+        "frameworks": ["arduino"],
+        "name": "MightyCore ATmega8535",
+        "platform": "atmelavr",
+        "upload": {
+            "maximum_ram_size": 512,
+            "maximum_size": 7680,
+            "protocol": "arduino",
+            "require_upload_port" : true,
+            "speed": 115200
+        },
+        "url": "https://www.tindie.com/products/MCUdude/dip-40-arduino-compatible-development-board",
+        "vendor": "Mcudude"
     }
-}
\ No newline at end of file
+}