diff --git a/bebop_driver/CMakeLists.txt b/bebop_driver/CMakeLists.txt
index 3cf5e91..c2f97b0 100644
--- a/bebop_driver/CMakeLists.txt
+++ b/bebop_driver/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(bebop_driver)
 
+add_definitions(-std=c++11 -D__STDC_CONSTANT_MACROS)
+
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
@@ -54,18 +56,19 @@ roslint_cpp(
 # Build ARDroneSDK3 through their custom build manager (ARSDKBuildUtils)
 # TODO: Replace ExternalProject with a catkin package wrapper or a cmake macro.
 # the build time is unnecessarily long due to many git checkout ./SDK3Build.py performs.
-include(ExternalProject)
-ExternalProject_Add(ARSDKBuildUtils
-    GIT_REPOSITORY https://github.com/ARDroneSDK3/ARSDKBuildUtils.git
-    GIT_TAG ARSDK3_version_3_6
-    PREFIX ${CATKIN_DEVEL_PREFIX}
-    CONFIGURE_COMMAND echo "No configure"
-    BUILD_COMMAND ./SDK3Build.py -t Unix
-    INSTALL_COMMAND echo "No install"
-    BUILD_IN_SOURCE 1
-)
-
-set(ARDRONESDK3_PATH "${CATKIN_DEVEL_PREFIX}/src/ARSDKBuildUtils/Targets/Unix/Install")
+#include(ExternalProject)
+#ExternalProject_Add(ARSDKBuildUtils
+#    GIT_REPOSITORY https://github.com/ARDroneSDK3/ARSDKBuildUtils.git
+#    GIT_TAG ARSDK3_version_3_6
+#    PREFIX ${CATKIN_DEVEL_PREFIX}
+#    CONFIGURE_COMMAND echo "No configure"
+#    BUILD_COMMAND ./SDK3Build.py -t Unix
+#    INSTALL_COMMAND echo "No install"
+#    BUILD_IN_SOURCE 1
+#)
+
+set(ARDRONESDK3_PATH "/home/edison/bebop_sdk_ws/ARSDKBuildUtils/Targets/Unix/Install")
+#set(ARDRONESDK3_PATH "${CATKIN_DEVEL_PREFIX}/src/ARSDKBuildUtils/Targets/Unix/Install")
 
 include_directories(
   ${catkin_INCLUDE_DIRS}
diff --git a/bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callbacks.h b/bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callbacks.h
index 7bd3046..4387e4e 100644
--- a/bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callbacks.h
+++ b/bebop_driver/include/bebop_driver/autogenerated/ardrone3_setting_callbacks.h
@@ -341,7 +341,6 @@ class PilotingSettingsMaxDistance : public AbstractSetting
     ::boost::lock_guard<boost::mutex> lock(mutex_);
 
     arg = NULL;
-    // manual edit to a bug in upstream XML
     HASH_FIND_STR (arguments, ARCONTROLLER_DICTIONARY_KEY_ARDRONE3_PILOTINGSETTINGSSTATE_MAXDISTANCECHANGED_CURRENT, arg);
     if (arg)
     {
diff --git a/bebop_driver/include/bebop_driver/autogenerated/callbacks_common.h b/bebop_driver/include/bebop_driver/autogenerated/callbacks_common.h
index ec501f2..ceec996 100644
--- a/bebop_driver/include/bebop_driver/autogenerated/callbacks_common.h
+++ b/bebop_driver/include/bebop_driver/autogenerated/callbacks_common.h
@@ -32,7 +32,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 #include <string>
 #include <ros/ros.h>
 #include <boost/thread/mutex.hpp>
-#include <boost/thread/lock_guard.hpp>
+#include <boost/thread/locks.hpp>
 
 namespace bebop_driver
 {
@@ -100,4 +100,4 @@ class AbstractSetting: public AbstractCommand
 }  // namespace cb
 }  // namespace bebop_driver
 
-#endif  // BEBOP_COMMON_COMMANDS_H
\ No newline at end of file
+#endif  // BEBOP_COMMON_COMMANDS_H
diff --git a/bebop_driver/include/bebop_driver/bebop.h b/bebop_driver/include/bebop_driver/bebop.h
index cfa0152..d5435bf 100644
--- a/bebop_driver/include/bebop_driver/bebop.h
+++ b/bebop_driver/include/bebop_driver/bebop.h
@@ -34,9 +34,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 #include <vector>
 #include <utility>
 #include <map>
+#include <atomic>
 
 #include <boost/shared_ptr.hpp>
-#include <boost/atomic.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 
@@ -85,8 +85,8 @@ class Bebop
 {
 private:
   static const char* LOG_TAG;
-  boost::atomic<bool> is_connected_;
-  boost::atomic<bool> is_streaming_started_;
+  std::atomic<bool> is_connected_;
+  std::atomic<bool> is_streaming_started_;
   ARDISCOVERY_Device_t* device_ptr_;
   ARCONTROLLER_Device_t* device_controller_ptr_;
   eARCONTROLLER_ERROR error_;
diff --git a/bebop_driver/scripts/meta/last_build_info b/bebop_driver/scripts/meta/last_build_info
index f2481cb..295b84f 100644
--- a/bebop_driver/scripts/meta/last_build_info
+++ b/bebop_driver/scripts/meta/last_build_info
@@ -1,5 +1,5 @@
 Last auto-generation build info:
 
 - Source hash  7e2f55fafcd45ba2380ca2574a08b7359c005f47
-- Date         2015-09-14 19:19:40.743928
-- Generator    generate.py @ 40b8351
+- Date         2015-10-29 18:14:51.109917
+- Generator    generate.py @ 61239d4
diff --git a/bebop_driver/scripts/meta/templates/callbacks_common.h.mustache b/bebop_driver/scripts/meta/templates/callbacks_common.h.mustache
index d856226..9b4a2b0 100644
--- a/bebop_driver/scripts/meta/templates/callbacks_common.h.mustache
+++ b/bebop_driver/scripts/meta/templates/callbacks_common.h.mustache
@@ -32,7 +32,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI
 #include <string>
 #include <ros/ros.h>
 #include <boost/thread/mutex.hpp>
-#include <boost/thread/lock_guard.hpp>
+#include <boost/thread/locks.hpp>
 
 namespace bebop_driver
 {
@@ -100,4 +100,4 @@ public:
 }  // namespace cb
 }  // namespace bebop_driver
 
-#endif  // BEBOP_COMMON_COMMANDS_H
\ No newline at end of file
+#endif  // BEBOP_COMMON_COMMANDS_H