diff --git a/mavros/282c9be/282c9be.bug b/mavros/282c9be/282c9be.bug
index 20656dd6..5c28c842 100644
--- a/mavros/282c9be/282c9be.bug
+++ b/mavros/282c9be/282c9be.bug
@@ -40,9 +40,15 @@ fix:
     - src/plugins/3dr_radio.cpp
   languages:
     - C++
-  time: 2014-07-26 (00:00)
+  time: 2014-07-26T13:14:56+04:00
 time-machine:
   ros_distro: hydro
   ros_pkgs:
     - mavros
-  issue: https://github.com/mavlink/mavros/issues/62
+  missing-dependencies:
+    - mavconn
+  datetime: 2014-07-26T13:14:56+04:00
+bugzoo:
+  is-build-failure: true
+  bug-commit: 366dadaadfb85e0a1450a4a59477419930f94372
+  fix-commit: 282c9bece1fa7bc87db070d836127b52bb9d1306
diff --git a/mavros/282c9be/deps.rosinstall b/mavros/282c9be/deps.rosinstall
new file mode 100644
index 00000000..f227e25e
--- /dev/null
+++ b/mavros/282c9be/deps.rosinstall
@@ -0,0 +1,221 @@
+- tar:
+    local-name: actionlib
+    uri: https://github.com/ros-gbp/actionlib-release/archive/release/hydro/actionlib/1.10.3-0.tar.gz
+    version: actionlib-release-release-hydro-actionlib-1.10.3-0
+- tar:
+    local-name: angles
+    uri: https://github.com/ros-gbp/geometry_angles_utils-release/archive/release/hydro/angles/1.9.9-0.tar.gz
+    version: geometry_angles_utils-release-release-hydro-angles-1.9.9-0
+- tar:
+    local-name: catkin
+    uri: https://github.com/ros-gbp/catkin-release/archive/release/hydro/catkin/0.5.88-0.tar.gz
+    version: catkin-release-release-hydro-catkin-0.5.88-0
+- tar:
+    local-name: class_loader
+    uri: https://github.com/ros-gbp/class_loader-release/archive/release/hydro/class_loader/0.2.5-0.tar.gz
+    version: class_loader-release-release-hydro-class_loader-0.2.5-0
+- tar:
+    local-name: common_msgs/actionlib_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/hydro/actionlib_msgs/1.10.6-0.tar.gz
+    version: common_msgs-release-release-hydro-actionlib_msgs-1.10.6-0
+- tar:
+    local-name: common_msgs/diagnostic_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/hydro/diagnostic_msgs/1.10.6-0.tar.gz
+    version: common_msgs-release-release-hydro-diagnostic_msgs-1.10.6-0
+- tar:
+    local-name: common_msgs/geometry_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/hydro/geometry_msgs/1.10.6-0.tar.gz
+    version: common_msgs-release-release-hydro-geometry_msgs-1.10.6-0
+- tar:
+    local-name: common_msgs/sensor_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/hydro/sensor_msgs/1.10.6-0.tar.gz
+    version: common_msgs-release-release-hydro-sensor_msgs-1.10.6-0
+- tar:
+    local-name: console_bridge
+    uri: https://github.com/ros-gbp/console_bridge-release/archive/release/hydro/console_bridge/0.2.4-1.tar.gz
+    version: console_bridge-release-release-hydro-console_bridge-0.2.4-1
+- tar:
+    local-name: diagnostics/diagnostic_updater
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/hydro/diagnostic_updater/1.8.4-0.tar.gz
+    version: diagnostics-release-release-hydro-diagnostic_updater-1.8.4-0
+- tar:
+    local-name: gencpp
+    uri: https://github.com/ros-gbp/gencpp-release/archive/release/hydro/gencpp/0.4.17-0.tar.gz
+    version: gencpp-release-release-hydro-gencpp-0.4.17-0
+- tar:
+    local-name: genlisp
+    uri: https://github.com/ros-gbp/genlisp-release/archive/release/hydro/genlisp/0.4.14-0.tar.gz
+    version: genlisp-release-release-hydro-genlisp-0.4.14-0
+- tar:
+    local-name: genmsg
+    uri: https://github.com/ros-gbp/genmsg-release/archive/release/hydro/genmsg/0.4.25-0.tar.gz
+    version: genmsg-release-release-hydro-genmsg-0.4.25-0
+- tar:
+    local-name: genpy
+    uri: https://github.com/ros-gbp/genpy-release/archive/release/hydro/genpy/0.4.17-0.tar.gz
+    version: genpy-release-release-hydro-genpy-0.4.17-0
+- tar:
+    local-name: geometry/tf
+    uri: https://github.com/ros-gbp/geometry-release/archive/release/hydro/tf/1.10.8-1.tar.gz
+    version: geometry-release-release-hydro-tf-1.10.8-1
+- tar:
+    local-name: geometry2/tf2
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/hydro/tf2/0.4.11-0.tar.gz
+    version: geometry2-release-release-hydro-tf2-0.4.11-0
+- tar:
+    local-name: geometry2/tf2_msgs
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/hydro/tf2_msgs/0.4.11-0.tar.gz
+    version: geometry2-release-release-hydro-tf2_msgs-0.4.11-0
+- tar:
+    local-name: geometry2/tf2_py
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/hydro/tf2_py/0.4.11-0.tar.gz
+    version: geometry2-release-release-hydro-tf2_py-0.4.11-0
+- tar:
+    local-name: geometry2/tf2_ros
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/hydro/tf2_ros/0.4.11-0.tar.gz
+    version: geometry2-release-release-hydro-tf2_ros-0.4.11-0
+- tar:
+    local-name: mavlink
+    uri: https://github.com/vooon/mavlink-gbp-release/archive/release/hydro/mavlink/1.0.9-5.tar.gz
+    version: mavlink-gbp-release-release-hydro-mavlink-1.0.9-5
+- tar:
+    local-name: mavros
+    uri: https://github.com/vooon/mavros-release/archive/release/hydro/mavros/0.6.0-0.tar.gz
+    version: mavros-release-release-hydro-mavros-0.6.0-0
+- tar:
+    local-name: message_generation
+    uri: https://github.com/ros-gbp/message_generation-release/archive/release/hydro/message_generation/0.2.10-0.tar.gz
+    version: message_generation-release-release-hydro-message_generation-0.2.10-0
+- tar:
+    local-name: message_runtime
+    uri: https://github.com/ros-gbp/message_runtime-release/archive/release/hydro/message_runtime/0.4.12-0.tar.gz
+    version: message_runtime-release-release-hydro-message_runtime-0.4.12-0
+- tar:
+    local-name: pluginlib
+    uri: https://github.com/ros-gbp/pluginlib-release/archive/release/hydro/pluginlib/1.9.24-0.tar.gz
+    version: pluginlib-release-release-hydro-pluginlib-1.9.24-0
+- tar:
+    local-name: ros/rosbuild
+    uri: https://github.com/ros-gbp/ros-release/archive/release/hydro/rosbuild/1.10.10-0.tar.gz
+    version: ros-release-release-hydro-rosbuild-1.10.10-0
+- tar:
+    local-name: ros/rosclean
+    uri: https://github.com/ros-gbp/ros-release/archive/release/hydro/rosclean/1.10.10-0.tar.gz
+    version: ros-release-release-hydro-rosclean-1.10.10-0
+- tar:
+    local-name: ros/roslang
+    uri: https://github.com/ros-gbp/ros-release/archive/release/hydro/roslang/1.10.10-0.tar.gz
+    version: ros-release-release-hydro-roslang-1.10.10-0
+- tar:
+    local-name: ros/roslib
+    uri: https://github.com/ros-gbp/ros-release/archive/release/hydro/roslib/1.10.10-0.tar.gz
+    version: ros-release-release-hydro-roslib-1.10.10-0
+- tar:
+    local-name: ros/rosunit
+    uri: https://github.com/ros-gbp/ros-release/archive/release/hydro/rosunit/1.10.10-0.tar.gz
+    version: ros-release-release-hydro-rosunit-1.10.10-0
+- tar:
+    local-name: ros_comm/message_filters
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/message_filters/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-message_filters-1.10.10-0
+- tar:
+    local-name: ros_comm/rosbag
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosbag/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosbag-1.10.10-0
+- tar:
+    local-name: ros_comm/rosbag_storage
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosbag_storage/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosbag_storage-1.10.10-0
+- tar:
+    local-name: ros_comm/rosconsole
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosconsole/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosconsole-1.10.10-0
+- tar:
+    local-name: ros_comm/roscpp
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/roscpp/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-roscpp-1.10.10-0
+- tar:
+    local-name: ros_comm/rosgraph
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosgraph/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosgraph-1.10.10-0
+- tar:
+    local-name: ros_comm/rosgraph_msgs
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosgraph_msgs/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosgraph_msgs-1.10.10-0
+- tar:
+    local-name: ros_comm/roslaunch
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/roslaunch/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-roslaunch-1.10.10-0
+- tar:
+    local-name: ros_comm/rosmaster
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosmaster/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosmaster-1.10.10-0
+- tar:
+    local-name: ros_comm/rosmsg
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosmsg/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosmsg-1.10.10-0
+- tar:
+    local-name: ros_comm/rosnode
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosnode/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosnode-1.10.10-0
+- tar:
+    local-name: ros_comm/rosout
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosout/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosout-1.10.10-0
+- tar:
+    local-name: ros_comm/rosparam
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosparam/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosparam-1.10.10-0
+- tar:
+    local-name: ros_comm/rospy
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rospy/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rospy-1.10.10-0
+- tar:
+    local-name: ros_comm/rosservice
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rosservice/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rosservice-1.10.10-0
+- tar:
+    local-name: ros_comm/rostest
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rostest/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rostest-1.10.10-0
+- tar:
+    local-name: ros_comm/rostopic
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/rostopic/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-rostopic-1.10.10-0
+- tar:
+    local-name: ros_comm/roswtf
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/roswtf/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-roswtf-1.10.10-0
+- tar:
+    local-name: ros_comm/topic_tools
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/topic_tools/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-topic_tools-1.10.10-0
+- tar:
+    local-name: ros_comm/xmlrpcpp
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/hydro/xmlrpcpp/1.10.10-0.tar.gz
+    version: ros_comm-release-release-hydro-xmlrpcpp-1.10.10-0
+- tar:
+    local-name: roscpp_core/cpp_common
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/hydro/cpp_common/0.4.3-0.tar.gz
+    version: roscpp_core-release-release-hydro-cpp_common-0.4.3-0
+- tar:
+    local-name: roscpp_core/roscpp_serialization
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/hydro/roscpp_serialization/0.4.3-0.tar.gz
+    version: roscpp_core-release-release-hydro-roscpp_serialization-0.4.3-0
+- tar:
+    local-name: roscpp_core/roscpp_traits
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/hydro/roscpp_traits/0.4.3-0.tar.gz
+    version: roscpp_core-release-release-hydro-roscpp_traits-0.4.3-0
+- tar:
+    local-name: roscpp_core/rostime
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/hydro/rostime/0.4.3-0.tar.gz
+    version: roscpp_core-release-release-hydro-rostime-0.4.3-0
+- tar:
+    local-name: rospack
+    uri: https://github.com/ros-gbp/rospack-release/archive/release/hydro/rospack/2.1.23-0.tar.gz
+    version: rospack-release-release-hydro-rospack-2.1.23-0
+- tar:
+    local-name: std_msgs
+    uri: https://github.com/ros-gbp/std_msgs-release/archive/release/hydro/std_msgs/0.5.8-0.tar.gz
+    version: std_msgs-release-release-hydro-std_msgs-0.5.8-0
+
diff --git a/mavros/282c9be/test.sh b/mavros/282c9be/test.sh
new file mode 100644
index 00000000..e69de29b
diff --git a/mavros/2998e9f/2998e9f.bug b/mavros/2998e9f/2998e9f.bug
index 56e0c499..c22681c8 100644
--- a/mavros/2998e9f/2998e9f.bug
+++ b/mavros/2998e9f/2998e9f.bug
@@ -46,9 +46,15 @@ fix:
     - src/plugins/sys_status.cpp
   languages:
     - C++
-  time: 2014-01-13 (00:00)
+  time: 2014-01-14T06:50:54+04:00
 time-machine:
   ros_distro: hydro
   ros_pkgs:
     - mavros
-  datetime: 2014-01-13
+  datetime: 2014-01-14T06:50:54+04:00
+bugzoo:
+  is-build-failure: false
+  bug-commit: 82007c06555130ca840c064ed3a93b7cfbdf8d32
+  fix-commit: 2998e9f7f9e0fb969e7248a46d5ecd0749614d06
+  fork-urls:
+    - https://github.com/robust-rosin/mavros
diff --git a/mavros/2998e9f/test.sh b/mavros/2998e9f/test.sh
new file mode 100644
index 00000000..e69de29b
diff --git a/mavros/84264f0/deps.rosinstall b/mavros/84264f0/deps.rosinstall
new file mode 100644
index 00000000..70675b0e
--- /dev/null
+++ b/mavros/84264f0/deps.rosinstall
@@ -0,0 +1,233 @@
+- tar:
+    local-name: actionlib
+    uri: https://github.com/ros-gbp/actionlib-release/archive/release/indigo/actionlib/1.11.3-0.tar.gz
+    version: actionlib-release-release-indigo-actionlib-1.11.3-0
+- tar:
+    local-name: angles
+    uri: https://github.com/ros-gbp/geometry_angles_utils-release/archive/release/indigo/angles/1.9.9-0.tar.gz
+    version: geometry_angles_utils-release-release-indigo-angles-1.9.9-0
+- tar:
+    local-name: catkin
+    uri: https://github.com/ros-gbp/catkin-release/archive/release/indigo/catkin/0.6.11-0.tar.gz
+    version: catkin-release-release-indigo-catkin-0.6.11-0
+- tar:
+    local-name: class_loader
+    uri: https://github.com/ros-gbp/class_loader-release/archive/release/indigo/class_loader/0.3.1-0.tar.gz
+    version: class_loader-release-release-indigo-class_loader-0.3.1-0
+- tar:
+    local-name: cmake_modules
+    uri: https://github.com/ros-gbp/cmake_modules-release/archive/release/indigo/cmake_modules/0.3.3-0.tar.gz
+    version: cmake_modules-release-release-indigo-cmake_modules-0.3.3-0
+- tar:
+    local-name: common_msgs/actionlib_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/indigo/actionlib_msgs/1.11.6-0.tar.gz
+    version: common_msgs-release-release-indigo-actionlib_msgs-1.11.6-0
+- tar:
+    local-name: common_msgs/diagnostic_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/indigo/diagnostic_msgs/1.11.6-0.tar.gz
+    version: common_msgs-release-release-indigo-diagnostic_msgs-1.11.6-0
+- tar:
+    local-name: common_msgs/geometry_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/indigo/geometry_msgs/1.11.6-0.tar.gz
+    version: common_msgs-release-release-indigo-geometry_msgs-1.11.6-0
+- tar:
+    local-name: common_msgs/sensor_msgs
+    uri: https://github.com/ros-gbp/common_msgs-release/archive/release/indigo/sensor_msgs/1.11.6-0.tar.gz
+    version: common_msgs-release-release-indigo-sensor_msgs-1.11.6-0
+- tar:
+    local-name: diagnostics/diagnostic_updater
+    uri: https://github.com/ros-gbp/diagnostics-release/archive/release/indigo/diagnostic_updater/1.8.7-0.tar.gz
+    version: diagnostics-release-release-indigo-diagnostic_updater-1.8.7-0
+- tar:
+    local-name: gencpp
+    uri: https://github.com/ros-gbp/gencpp-release/archive/release/indigo/gencpp/0.5.3-0.tar.gz
+    version: gencpp-release-release-indigo-gencpp-0.5.3-0
+- tar:
+    local-name: genlisp
+    uri: https://github.com/ros-gbp/genlisp-release/archive/release/indigo/genlisp/0.4.14-0.tar.gz
+    version: genlisp-release-release-indigo-genlisp-0.4.14-0
+- tar:
+    local-name: genmsg
+    uri: https://github.com/ros-gbp/genmsg-release/archive/release/indigo/genmsg/0.5.6-0.tar.gz
+    version: genmsg-release-release-indigo-genmsg-0.5.6-0
+- tar:
+    local-name: genpy
+    uri: https://github.com/ros-gbp/genpy-release/archive/release/indigo/genpy/0.5.4-0.tar.gz
+    version: genpy-release-release-indigo-genpy-0.5.4-0
+- tar:
+    local-name: geometry/tf
+    uri: https://github.com/ros-gbp/geometry-release/archive/release/indigo/tf/1.11.4-0.tar.gz
+    version: geometry-release-release-indigo-tf-1.11.4-0
+- tar:
+    local-name: geometry2/tf2
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/indigo/tf2/0.5.7-0.tar.gz
+    version: geometry2-release-release-indigo-tf2-0.5.7-0
+- tar:
+    local-name: geometry2/tf2_msgs
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/indigo/tf2_msgs/0.5.7-0.tar.gz
+    version: geometry2-release-release-indigo-tf2_msgs-0.5.7-0
+- tar:
+    local-name: geometry2/tf2_py
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/indigo/tf2_py/0.5.7-0.tar.gz
+    version: geometry2-release-release-indigo-tf2_py-0.5.7-0
+- tar:
+    local-name: geometry2/tf2_ros
+    uri: https://github.com/ros-gbp/geometry2-release/archive/release/indigo/tf2_ros/0.5.7-0.tar.gz
+    version: geometry2-release-release-indigo-tf2_ros-0.5.7-0
+- tar:
+    local-name: mavlink
+    uri: https://github.com/mavlink/mavlink-gbp-release/archive/release/indigo/mavlink/2015.2.2-0.tar.gz
+    version: mavlink-gbp-release-release-indigo-mavlink-2015.2.2-0
+- tar:
+    local-name: mavros/libmavconn
+    uri: https://github.com/mavlink/mavros-release/archive/release/indigo/libmavconn/0.10.1-0.tar.gz
+    version: mavros-release-release-indigo-libmavconn-0.10.1-0
+- tar:
+    local-name: message_generation
+    uri: https://github.com/ros-gbp/message_generation-release/archive/release/indigo/message_generation/0.2.10-0.tar.gz
+    version: message_generation-release-release-indigo-message_generation-0.2.10-0
+- tar:
+    local-name: message_runtime
+    uri: https://github.com/ros-gbp/message_runtime-release/archive/release/indigo/message_runtime/0.4.12-0.tar.gz
+    version: message_runtime-release-release-indigo-message_runtime-0.4.12-0
+- tar:
+    local-name: pluginlib
+    uri: https://github.com/ros-gbp/pluginlib-release/archive/release/indigo/pluginlib/1.10.1-0.tar.gz
+    version: pluginlib-release-release-indigo-pluginlib-1.10.1-0
+- tar:
+    local-name: ros/rosbuild
+    uri: https://github.com/ros-gbp/ros-release/archive/release/indigo/rosbuild/1.11.6-0.tar.gz
+    version: ros-release-release-indigo-rosbuild-1.11.6-0
+- tar:
+    local-name: ros/rosclean
+    uri: https://github.com/ros-gbp/ros-release/archive/release/indigo/rosclean/1.11.6-0.tar.gz
+    version: ros-release-release-indigo-rosclean-1.11.6-0
+- tar:
+    local-name: ros/roslang
+    uri: https://github.com/ros-gbp/ros-release/archive/release/indigo/roslang/1.11.6-0.tar.gz
+    version: ros-release-release-indigo-roslang-1.11.6-0
+- tar:
+    local-name: ros/roslib
+    uri: https://github.com/ros-gbp/ros-release/archive/release/indigo/roslib/1.11.6-0.tar.gz
+    version: ros-release-release-indigo-roslib-1.11.6-0
+- tar:
+    local-name: ros/rosunit
+    uri: https://github.com/ros-gbp/ros-release/archive/release/indigo/rosunit/1.11.6-0.tar.gz
+    version: ros-release-release-indigo-rosunit-1.11.6-0
+- tar:
+    local-name: ros_comm/message_filters
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/message_filters/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-message_filters-1.11.10-0
+- tar:
+    local-name: ros_comm/rosbag
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosbag/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosbag-1.11.10-0
+- tar:
+    local-name: ros_comm/rosbag_storage
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosbag_storage/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosbag_storage-1.11.10-0
+- tar:
+    local-name: ros_comm/rosconsole
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosconsole/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosconsole-1.11.10-0
+- tar:
+    local-name: ros_comm/roscpp
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roscpp/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-roscpp-1.11.10-0
+- tar:
+    local-name: ros_comm/rosgraph
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosgraph/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosgraph-1.11.10-0
+- tar:
+    local-name: ros_comm/roslaunch
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roslaunch/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-roslaunch-1.11.10-0
+- tar:
+    local-name: ros_comm/roslz4
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roslz4/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-roslz4-1.11.10-0
+- tar:
+    local-name: ros_comm/rosmaster
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosmaster/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosmaster-1.11.10-0
+- tar:
+    local-name: ros_comm/rosmsg
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosmsg/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosmsg-1.11.10-0
+- tar:
+    local-name: ros_comm/rosnode
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosnode/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosnode-1.11.10-0
+- tar:
+    local-name: ros_comm/rosout
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosout/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosout-1.11.10-0
+- tar:
+    local-name: ros_comm/rosparam
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosparam/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosparam-1.11.10-0
+- tar:
+    local-name: ros_comm/rospy
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rospy/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rospy-1.11.10-0
+- tar:
+    local-name: ros_comm/rosservice
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rosservice/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rosservice-1.11.10-0
+- tar:
+    local-name: ros_comm/rostest
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rostest/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rostest-1.11.10-0
+- tar:
+    local-name: ros_comm/rostopic
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/rostopic/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-rostopic-1.11.10-0
+- tar:
+    local-name: ros_comm/roswtf
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/roswtf/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-roswtf-1.11.10-0
+- tar:
+    local-name: ros_comm/topic_tools
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/topic_tools/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-topic_tools-1.11.10-0
+- tar:
+    local-name: ros_comm/xmlrpcpp
+    uri: https://github.com/ros-gbp/ros_comm-release/archive/release/indigo/xmlrpcpp/1.11.10-0.tar.gz
+    version: ros_comm-release-release-indigo-xmlrpcpp-1.11.10-0
+- tar:
+    local-name: ros_comm_msgs/rosgraph_msgs
+    uri: https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/indigo/rosgraph_msgs/1.10.3-0.tar.gz
+    version: ros_comm_msgs-release-release-indigo-rosgraph_msgs-1.10.3-0
+- tar:
+    local-name: ros_comm_msgs/std_srvs
+    uri: https://github.com/ros-gbp/ros_comm_msgs-release/archive/release/indigo/std_srvs/1.10.3-0.tar.gz
+    version: ros_comm_msgs-release-release-indigo-std_srvs-1.10.3-0
+- tar:
+    local-name: rosconsole_bridge
+    uri: https://github.com/ros-gbp/rosconsole_bridge-release/archive/release/indigo/rosconsole_bridge/0.4.2-0.tar.gz
+    version: rosconsole_bridge-release-release-indigo-rosconsole_bridge-0.4.2-0
+- tar:
+    local-name: roscpp_core/cpp_common
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/cpp_common/0.5.5-0.tar.gz
+    version: roscpp_core-release-release-indigo-cpp_common-0.5.5-0
+- tar:
+    local-name: roscpp_core/roscpp_serialization
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/roscpp_serialization/0.5.5-0.tar.gz
+    version: roscpp_core-release-release-indigo-roscpp_serialization-0.5.5-0
+- tar:
+    local-name: roscpp_core/roscpp_traits
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/roscpp_traits/0.5.5-0.tar.gz
+    version: roscpp_core-release-release-indigo-roscpp_traits-0.5.5-0
+- tar:
+    local-name: roscpp_core/rostime
+    uri: https://github.com/ros-gbp/roscpp_core-release/archive/release/indigo/rostime/0.5.5-0.tar.gz
+    version: roscpp_core-release-release-indigo-rostime-0.5.5-0
+- tar:
+    local-name: rospack
+    uri: https://github.com/ros-gbp/rospack-release/archive/release/indigo/rospack/2.2.5-0.tar.gz
+    version: rospack-release-release-indigo-rospack-2.2.5-0
+- tar:
+    local-name: std_msgs
+    uri: https://github.com/ros-gbp/std_msgs-release/archive/release/indigo/std_msgs/0.5.9-1.tar.gz
+    version: std_msgs-release-release-indigo-std_msgs-0.5.9-1
+
diff --git a/scripts/build-rosinstall.py b/scripts/build-rosinstall.py
index 13f3a588..aa4d6988 100644
--- a/scripts/build-rosinstall.py
+++ b/scripts/build-rosinstall.py
@@ -101,13 +101,14 @@ def build_file(fn_bug_desc, overwrite=False):
     missing_deps = d['time-machine'].get('missing-dependencies', [])
 
     if 'datetime' in d['time-machine']:
-        dt = d['time-machine']['datetime'].isoformat()
-        if dt[-1] != 'Z':
-            dt += 'Z'
+        dt = d['time-machine']['datetime']
+        dt_string = dt.isoformat()
+        if not dt.tzinfo and dt_string[-1] != 'Z':
+            dt_string += 'Z'
     elif 'issue' in d['time-machine']:
         url_issue = d['time-machine']['issue']
         try:
-            dt = gh_issue_to_datetime(url_issue)
+            dt_string = gh_issue_to_datetime(url_issue)
         except Exception:
             m = "failed to convert GitHub issue to ISO 8601 timestamp: {}"
             m = m.format(url_issue)
@@ -117,9 +118,9 @@ def build_file(fn_bug_desc, overwrite=False):
 
     try:
         deps = {}
-        deps.update(_time_machine(ros_pkgs, dt, distro, deps_only=True))
+        deps.update(_time_machine(ros_pkgs, dt_string, distro, deps_only=True))
         if missing_deps:
-            deps.update(_time_machine(missing_deps, dt, distro, deps_only=False))
+            deps.update(_time_machine(missing_deps, dt_string, distro, deps_only=False))
     except subprocess.CalledProcessError as err:
         logger.warning("time machine failed (return code: %d) for bug [%s]",
                        err.returncode, fn_bug_desc)