diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..5fd733e
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: gitsubmodule
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "10:00"
+  open-pull-requests-limit: 10
diff --git a/.travis.yml b/.travis.yml
index 77e3b29..b6e689b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,8 +63,15 @@ before_install:
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update
       brew reinstall boost cmake ccache gnu-getopt readline omniorb
-      brew link --force gnu-getopt
-      brew link --force readline
+
+      # gnu-getopt is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force gnu-getopt
+      export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"
+
+      # readline is keg-only and newer HomeBrew versions refuse to link it.
+      #brew link --force readline
+      export CMAKE_PREFIX_PATH="/usr/local/opt/readline"
+
       export PATH="/use/local/opt/ccache/libexec:$PATH"
     fi
 
diff --git a/ocl b/ocl
index 625fce6..975ec83 160000
--- a/ocl
+++ b/ocl
@@ -1 +1 @@
-Subproject commit 625fce6049047716051dba37a9e55c7d86d005e1
+Subproject commit 975ec83c4b90f32616d1b131faf130206bc83c11
diff --git a/orocos_toolchain/package.xml b/orocos_toolchain/package.xml
index 65a0eca..f3254bf 100644
--- a/orocos_toolchain/package.xml
+++ b/orocos_toolchain/package.xml
@@ -6,15 +6,15 @@
   <description>
     This metapackage provides Orocos RTT and OCL and dependencies.
   </description>
-  <license>GPL v2 + linking exception<license>
-  <licence>LGPL-2.1</license>
+  <license>GPL v2 + linking exception</license>
+  <license>LGPL-2.1</license>
   <maintainer email="orocos-dev@orocos.org">Orocos Developers</maintainer>
 
-  <buildtool_depend>catkin</buildtool_depend> <!-- optional -->
+  <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend> <!-- optional -->
 
-  <depend>log4cpp</depend>
-  <depend>ocl</depend>
-  <depend>rtt</depend>
+  <exec_depend>log4cpp</exec_depend>
+  <exec_depend>ocl</exec_depend>
+  <exec_depend>rtt</exec_depend>
 
   <export>
     <metapackage/>
diff --git a/orogen b/orogen
index 4656fe7..69028da 160000
--- a/orogen
+++ b/orogen
@@ -1 +1 @@
-Subproject commit 4656fe7950ce477af5fcaba73ca74436cc7061cd
+Subproject commit 69028da321e4715222fabfe03c68253870e63a29
diff --git a/rtt b/rtt
index 841f44d..c11d944 160000
--- a/rtt
+++ b/rtt
@@ -1 +1 @@
-Subproject commit 841f44dc0401a818a3e68665fd322f6d21fb7321
+Subproject commit c11d94410aaa165195ba66935e765ffef48c1a07
diff --git a/typelib b/typelib
index 89063c5..5a4f821 160000
--- a/typelib
+++ b/typelib
@@ -1 +1 @@
-Subproject commit 89063c58591f673627a01e8f3caaf0b148a1c4f8
+Subproject commit 5a4f821041c1ae17738aef8dff1bd00fe5665b7a
diff --git a/utilrb b/utilrb
index 59c4d1b..8398b0b 160000
--- a/utilrb
+++ b/utilrb
@@ -1 +1 @@
-Subproject commit 59c4d1bf0dd8540a3d19554aa8c7e50c8c7e2416
+Subproject commit 8398b0b32b7fd067e23c58f3fd59e3611f06607e