diff --git a/devel/arduino18/Makefile b/devel/arduino18/Makefile
index c14d666cd722..fae18fd9861a 100644
--- a/devel/arduino18/Makefile
+++ b/devel/arduino18/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	arduino
-PORTVERSION=	1.8.2
-PORTREVISION=	3
+PORTVERSION=	1.8.5
 CATEGORIES=	devel java
 PKGNAMESUFFIX=	18
 DIST_SUBDIR=	${PORTNAME}
@@ -23,20 +22,21 @@ RUN_DEPENDS=	arduino-builder:devel/arduino-builder \
 CONFLICTS=	arduino-[0-9]*
 
 BUNDLE_GH_ACCOUNT=	arduino-libraries
-BUNDLE_LIBRARIES=	Firmata:2.5.5:firmata \
+BUNDLE_LIBRARIES=	Firmata:2.5.6:firmata \
 			Bridge:1.6.3:bridge \
-			Robot_Control:1.0.2:robotcontrol \
-			Robot_Motor:1.0.2:robotmotor \
-			RobotIRremote:1.0.2:robotir \
+			Robot_Control:1.0.4:robotcontrol \
+			Robot_Motor:1.0.3:robotmotor \
+			RobotIRremote:2.0.0:robotir \
 			SpacebrewYun:1.0.1:spacebrew \
-			Temboo:1.1.8:temboo \
+			Temboo:1.2.1:temboo \
 			Esplora:1.0.4:esplora \
 			Mouse:1.0.1:mouse \
 			Keyboard:1.0.1:keyboard \
 			SD:1.1.1:sd \
-			Servo:1.1.2:servo
+			Servo:1.1.2:servo \
+			LiquidCrystal:1.0.7:liquidcrystal
 
-GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.0:wifi10/linux/work/tools/WiFi101
+GH_TUPLE+=	${BUNDLE_GH_ACCOUNT}:WiFi101-FirmwareUpdater-Plugin:v0.9.2:wifi10/linux/work/tools/WiFi101
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino
diff --git a/devel/arduino18/distinfo b/devel/arduino18/distinfo
index 4fd2f62d1fa6..dfb8735cadf1 100644
--- a/devel/arduino18/distinfo
+++ b/devel/arduino18/distinfo
@@ -1,28 +1,28 @@
-TIMESTAMP = 1490197071
+TIMESTAMP = 1531777793
 SHA256 (arduino/reference-1.6.6-3.zip) = c3bfb7f9b408fd99a4a1c0f3b022f0a8b10abae6dc28e35d38b4a0df62903685
 SIZE (arduino/reference-1.6.6-3.zip) = 7004842
 SHA256 (arduino/Galileo_help_files-1.6.2.zip) = 1c70276e4783286d59c8ac0132c3286e7dcf6825bea65e25747a94416b07aa61
 SIZE (arduino/Galileo_help_files-1.6.2.zip) = 4352077
 SHA256 (arduino/Edison_help_files-1.6.2.zip) = 56718ce5b2b090d79dae298f6ff9a09c8c1a77f74e3594a951f7035877cc45f4
 SIZE (arduino/Edison_help_files-1.6.2.zip) = 3321743
-SHA256 (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = df7dba7ad20ca315788d309b9e52d45d1ec509c701a52121426098133e87d674
-SIZE (arduino/arduino-Arduino-1.8.2_GH0.tar.gz) = 48191808
-SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 43f3f992bb1cda45f8609eb0269e394d9c7e2ffab45a29a2bc312579c489d9d1
-SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.0_GH0.tar.gz) = 810749
-SHA256 (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = c34732d01e27cfabfc47a12cc684a8d66a484252a19aed41c19b2f06a971535b
-SIZE (arduino/arduino-libraries-Firmata-2.5.5_GH0.tar.gz) = 162998
+SHA256 (arduino/arduino-Arduino-1.8.5_GH0.tar.gz) = 57e8c4cf9147135a10cfd45431189a675b1c39ddf833eaeed553f4fc869fdf69
+SIZE (arduino/arduino-Arduino-1.8.5_GH0.tar.gz) = 48219839
+SHA256 (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.2_GH0.tar.gz) = 8e69721890a5369a138a062e80d91b2bd373281f095642606c8592b6f012da45
+SIZE (arduino/arduino-libraries-WiFi101-FirmwareUpdater-Plugin-v0.9.2_GH0.tar.gz) = 1053814
+SHA256 (arduino/arduino-libraries-Firmata-2.5.6_GH0.tar.gz) = e2f942a10dbaaa13b08491e9059c603a078429d5009b1f2227ec290c7d018337
+SIZE (arduino/arduino-libraries-Firmata-2.5.6_GH0.tar.gz) = 163736
 SHA256 (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 8c5f01530973aef9dbd47bd748c093e0a0774cca425e2b00e058f12d805a483f
 SIZE (arduino/arduino-libraries-Bridge-1.6.3_GH0.tar.gz) = 36011
-SHA256 (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 1c40bbd733ea3abde7f45102ad61e019c9512670a0da3a43bc0e609a03996a57
-SIZE (arduino/arduino-libraries-Robot_Control-1.0.2_GH0.tar.gz) = 78144
-SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = b7bf0d33288e92801410332c53033fa83540fcdfcd14edda890133f1fedba288
-SIZE (arduino/arduino-libraries-Robot_Motor-1.0.2_GH0.tar.gz) = 7892
-SHA256 (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 58de60b9deb51172c5cb0ba31ce66cae021b937c3f22c69580f59f94b7692af0
-SIZE (arduino/arduino-libraries-RobotIRremote-1.0.2_GH0.tar.gz) = 19013
+SHA256 (arduino/arduino-libraries-Robot_Control-1.0.4_GH0.tar.gz) = b56c0e21bc08bdb4031223112149869014d8d297481ebc52a423191429a33ecc
+SIZE (arduino/arduino-libraries-Robot_Control-1.0.4_GH0.tar.gz) = 79478
+SHA256 (arduino/arduino-libraries-Robot_Motor-1.0.3_GH0.tar.gz) = 00100dd034c6f004ebee8e44bf6967e2522f273fc9914532a329ea04ba52fc11
+SIZE (arduino/arduino-libraries-Robot_Motor-1.0.3_GH0.tar.gz) = 8020
+SHA256 (arduino/arduino-libraries-RobotIRremote-2.0.0_GH0.tar.gz) = bbd470d038821ea514679219d163493449dd15e9e185511aceffe61b26f6a900
+SIZE (arduino/arduino-libraries-RobotIRremote-2.0.0_GH0.tar.gz) = 19013
 SHA256 (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = b9ac22651020c04a246a0f839c7b7627dff22b1998e6640ee6112d7251538d09
 SIZE (arduino/arduino-libraries-SpacebrewYun-1.0.1_GH0.tar.gz) = 6901
-SHA256 (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 1aee8614db469e43e2333ff47efcbe3b83fcdb34dd02cd656ec73de2815e39ac
-SIZE (arduino/arduino-libraries-Temboo-1.1.8_GH0.tar.gz) = 90457
+SHA256 (arduino/arduino-libraries-Temboo-1.2.1_GH0.tar.gz) = 5fa2b0ea1687d9237ead499dfa378f6b588803e84f920f5e971b49ac30df3731
+SIZE (arduino/arduino-libraries-Temboo-1.2.1_GH0.tar.gz) = 95782
 SHA256 (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 67644c34290d02d7867af87743e5326de55ee076f44ce2edbcd6fabad2ce7bac
 SIZE (arduino/arduino-libraries-Esplora-1.0.4_GH0.tar.gz) = 12615
 SHA256 (arduino/arduino-libraries-Mouse-1.0.1_GH0.tar.gz) = 9269148995b5053a31781a085715f86ba60d9cf209fa1f13ba108858f1f50204
@@ -33,3 +33,5 @@ SHA256 (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = bee40dae69eebc39a3cbd37
 SIZE (arduino/arduino-libraries-SD-1.1.1_GH0.tar.gz) = 47102
 SHA256 (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = a58f5b9087efa12d30afb67e5f0f7bdb9b22548d6ad3c5241eec3dd3d851641d
 SIZE (arduino/arduino-libraries-Servo-1.1.2_GH0.tar.gz) = 14059
+SHA256 (arduino/arduino-libraries-LiquidCrystal-1.0.7_GH0.tar.gz) = 3641e8f4175ee8c66bbbc7e93961cd8ef333b9cd3689aa83c2512a23ba68200c
+SIZE (arduino/arduino-libraries-LiquidCrystal-1.0.7_GH0.tar.gz) = 7995
diff --git a/devel/arduino18/files/patch-build_build.xml b/devel/arduino18/files/patch-build_build.xml
index e5f7e674afbf..4323d3cf1736 100644
--- a/devel/arduino18/files/patch-build_build.xml
+++ b/devel/arduino18/files/patch-build_build.xml
@@ -1,6 +1,6 @@
---- build/build.xml.orig	2017-03-16 17:38:01 UTC
+--- build/build.xml.orig	2017-09-28 14:43:01 UTC
 +++ build/build.xml
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@
    </fileset>
  
    <target name="build" description="Build Arduino.">
@@ -9,15 +9,15 @@
  
      <antcall target="generate-hourly-build-txt"/>
    </target>
-@@ -184,37 +184,9 @@
+@@ -186,37 +186,9 @@
      <echo file="${target.path}/lib/version.txt" message="${version}" />
  
      <antcall target="assemble-libraries" />
 -
 -    <!-- Add WiFi101 updater tool -->
 -    <antcall target="unzip">
--      <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" />
--      <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" />
+-      <param name="archive_file" value="shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" />
+-      <param name="archive_url" value="https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip" />
 -      <param name="final_folder" value="${target.path}/tools/WiFi101" />
 -      <param name="dest_folder" value="${target.path}/tools/" />
 -    </antcall>
@@ -47,9 +47,9 @@
        <!-- Fix wrong permissions from zip file root folder -->
        <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" />
        <chmod perm="755" dir="${target.path}/reference/Edison_help_files" />
-@@ -239,6 +211,9 @@
-     <download-library name="SD" version="1.1.1"/>
-     <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
+@@ -243,6 +215,9 @@
+     <download-library name="LiquidCrystal" version="1.0.7"/>
+     <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.8" foldername="Adafruit_Circuit_Playground"/>
    </target>
 +  <target name="assemble-libraries-light" if="light_bundle">
 +    <mkdir dir="${target.path}/libraries" />
@@ -57,7 +57,7 @@
  
    <macrodef name="download-library">
      <attribute name="name"/>
-@@ -257,13 +232,17 @@
+@@ -262,13 +237,17 @@
    </macrodef>
  
    <!-- copy hardware folder -->
@@ -76,7 +76,7 @@
  
    <!-- - - - - - - - - -->
    <!-- Revision check  -->
-@@ -638,53 +617,15 @@
+@@ -642,53 +621,15 @@
    </target>
  
    <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
diff --git a/devel/arduino18/pkg-plist b/devel/arduino18/pkg-plist
index 87baec1f0e48..8dfac89166ac 100644
--- a/devel/arduino18/pkg-plist
+++ b/devel/arduino18/pkg-plist
@@ -51,7 +51,6 @@ arduino/arduino-builder
 %%EXAMPLES%%arduino/examples/02.Digital/toneMelody/toneMelody.ino
 %%EXAMPLES%%arduino/examples/02.Digital/toneMelody/toneMelody.txt
 %%EXAMPLES%%arduino/examples/02.Digital/toneMultiple/layout.png
-%%EXAMPLES%%arduino/examples/02.Digital/toneMultiple/pitches.h
 %%EXAMPLES%%arduino/examples/02.Digital/toneMultiple/schematic.png
 %%EXAMPLES%%arduino/examples/02.Digital/toneMultiple/toneMultiple.ino
 %%EXAMPLES%%arduino/examples/02.Digital/toneMultiple/toneMultiple.txt
@@ -287,6 +286,7 @@ arduino/lib/jmdns-3.5.1.jar
 arduino/lib/jna-4.2.2.jar
 arduino/lib/jna-platform-4.2.2.jar
 arduino/lib/jsch-0.1.50.jar
+arduino/lib/jssc-2.8.0-arduino1.jar
 arduino/lib/keywords.txt
 arduino/lib/libastylej.so
 arduino/lib/liblistSerialsj.so
@@ -606,10 +606,10 @@ arduino/libraries/RobotIRremote/extras/readme
 arduino/libraries/RobotIRremote/keywords.txt
 arduino/libraries/RobotIRremote/library.properties
 arduino/libraries/RobotIRremote/src/IRremote.cpp
-arduino/libraries/RobotIRremote/src/IRremote.h
-arduino/libraries/RobotIRremote/src/IRremoteInt.h
 arduino/libraries/RobotIRremote/src/IRremoteTools.cpp
-arduino/libraries/RobotIRremote/src/IRremoteTools.h
+arduino/libraries/RobotIRremote/src/RobotIRremote.h
+arduino/libraries/RobotIRremote/src/RobotIRremoteInt.h
+arduino/libraries/RobotIRremote/src/RobotIRremoteTools.h
 arduino/libraries/Robot_Control/README.adoc
 %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R01_Logo/R01_Logo.ino
 %%EXAMPLES%%arduino/libraries/Robot_Control/examples/explore/R02_Line_Follow/R02_Line_Follow.ino
@@ -780,7 +780,6 @@ arduino/libraries/TFT/src/utility/PImage.h
 arduino/libraries/TFT/src/utility/glcdfont.c
 arduino/libraries/TFT/src/utility/keywords.txt
 arduino/libraries/Temboo/README.adoc
-%%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/CloudControlsConfig/CloudControlsConfig.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/GetYahooWeatherReport/GetYahooWeatherReport.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/GetYahooWeatherReport/TembooAccount.h
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/ReadATweet/ReadATweet.ino
@@ -793,12 +792,14 @@ arduino/libraries/Temboo/README.adoc
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/SendAnSMS/TembooAccount.h
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/SendDataToGoogleSpreadsheet/SendDataToGoogleSpreadsheet.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/SendDataToGoogleSpreadsheet/TembooAccount.h
+%%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/TembooDeviceConfig/TembooDeviceConfig.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/ToxicFacilitiesSearch/TembooAccount.h
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/ToxicFacilitiesSearch/ToxicFacilitiesSearch.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/UpdateFacebookStatus/TembooAccount.h
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/UpdateFacebookStatus/UpdateFacebookStatus.ino
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/UploadToDropbox/TembooAccount.h
 %%EXAMPLES%%arduino/libraries/Temboo/examples/ArduinoYun/UploadToDropbox/UploadToDropbox.ino
+%%EXAMPLES%%arduino/libraries/Temboo/examples/YunShield/TembooDeviceConfig/TembooDeviceConfig.ino
 arduino/libraries/Temboo/keywords.txt
 arduino/libraries/Temboo/library.properties
 arduino/libraries/Temboo/src/Temboo.cpp
@@ -809,12 +810,24 @@ arduino/libraries/Temboo/src/TembooMQTTEdgeDevice.cpp
 arduino/libraries/Temboo/src/TembooMQTTEdgeDevice.h
 arduino/libraries/Temboo/src/TembooMonitoring.cpp
 arduino/libraries/Temboo/src/TembooMonitoring.h
+arduino/libraries/Temboo/src/TembooSSL.cpp
+arduino/libraries/Temboo/src/TembooSSL.h
 arduino/libraries/Temboo/src/TembooYunShield.h
 arduino/libraries/Temboo/src/utility/ArduinoTimer.h
 arduino/libraries/Temboo/src/utility/BaseFormatter.cpp
 arduino/libraries/Temboo/src/utility/BaseFormatter.h
+arduino/libraries/Temboo/src/utility/ChoreoDevice.cpp
+arduino/libraries/Temboo/src/utility/ChoreoDevice.h
+arduino/libraries/Temboo/src/utility/ChoreoDeviceFormatter.cpp
+arduino/libraries/Temboo/src/utility/ChoreoDeviceFormatter.h
 arduino/libraries/Temboo/src/utility/ChoreoInput.cpp
 arduino/libraries/Temboo/src/utility/ChoreoInput.h
+arduino/libraries/Temboo/src/utility/ChoreoInputExpression.cpp
+arduino/libraries/Temboo/src/utility/ChoreoInputExpression.h
+arduino/libraries/Temboo/src/utility/ChoreoInputExpressionFormatter.cpp
+arduino/libraries/Temboo/src/utility/ChoreoInputExpressionFormatter.h
+arduino/libraries/Temboo/src/utility/ChoreoInputExpressionSet.cpp
+arduino/libraries/Temboo/src/utility/ChoreoInputExpressionSet.h
 arduino/libraries/Temboo/src/utility/ChoreoInputFormatter.cpp
 arduino/libraries/Temboo/src/utility/ChoreoInputFormatter.h
 arduino/libraries/Temboo/src/utility/ChoreoInputSet.cpp
@@ -829,6 +842,12 @@ arduino/libraries/Temboo/src/utility/ChoreoPreset.cpp
 arduino/libraries/Temboo/src/utility/ChoreoPreset.h
 arduino/libraries/Temboo/src/utility/ChoreoPresetFormatter.cpp
 arduino/libraries/Temboo/src/utility/ChoreoPresetFormatter.h
+arduino/libraries/Temboo/src/utility/ChoreoSensorInput.cpp
+arduino/libraries/Temboo/src/utility/ChoreoSensorInput.h
+arduino/libraries/Temboo/src/utility/ChoreoSensorInputFormatter.cpp
+arduino/libraries/Temboo/src/utility/ChoreoSensorInputFormatter.h
+arduino/libraries/Temboo/src/utility/ChoreoSensorInputSet.cpp
+arduino/libraries/Temboo/src/utility/ChoreoSensorInputSet.h
 arduino/libraries/Temboo/src/utility/CoapMessageLayer.cpp
 arduino/libraries/Temboo/src/utility/CoapMessageLayer.h
 arduino/libraries/Temboo/src/utility/CoapMsg.cpp
@@ -2055,6 +2074,7 @@ arduino/tools/WiFi101/build.sh
 arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_2b0.bin
 arduino/tools/WiFi101/firmwares/19.4.4/m2m_aio_3a0.bin
 arduino/tools/WiFi101/firmwares/19.5.2/m2m_aio_3a0.bin
+arduino/tools/WiFi101/firmwares/19.5.4/m2m_aio_3a0.bin
 arduino/tools/WiFi101/screenshot-0.png
 arduino/tools/WiFi101/screenshot-1.png
 arduino/tools/WiFi101/screenshot-2.png