diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
index d789f7614..89655dd87 100644
--- a/diagnostic_aggregator/CMakeLists.txt
+++ b/diagnostic_aggregator/CMakeLists.txt
@@ -2,8 +2,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(diagnostic_aggregator)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED diagnostic_msgs pluginlib roscpp rospy xmlrpcpp bondcpp)
diff --git a/diagnostic_analysis/CMakeLists.txt b/diagnostic_analysis/CMakeLists.txt
index 8a63e8b58..744026990 100644
--- a/diagnostic_analysis/CMakeLists.txt
+++ b/diagnostic_analysis/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(diagnostic_analysis)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED diagnostic_msgs rosbag roslib)
diff --git a/diagnostic_common_diagnostics/CMakeLists.txt b/diagnostic_common_diagnostics/CMakeLists.txt
index dc1fe0c3f..8631d8418 100644
--- a/diagnostic_common_diagnostics/CMakeLists.txt
+++ b/diagnostic_common_diagnostics/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(diagnostic_common_diagnostics)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED COMPONENTS diagnostic_updater)
diff --git a/diagnostic_updater/CMakeLists.txt b/diagnostic_updater/CMakeLists.txt
index acaa2e5ce..0e8967d31 100644
--- a/diagnostic_updater/CMakeLists.txt
+++ b/diagnostic_updater/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(diagnostic_updater)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED diagnostic_msgs roscpp std_msgs)
diff --git a/rosdiagnostic/CMakeLists.txt b/rosdiagnostic/CMakeLists.txt
index 2c6ae1748..5d7c7b091 100644
--- a/rosdiagnostic/CMakeLists.txt
+++ b/rosdiagnostic/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(rosdiagnostic)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 #find_package(catkin REQUIRED)
 
diff --git a/self_test/CMakeLists.txt b/self_test/CMakeLists.txt
index 064eaddae..c3a18a24b 100644
--- a/self_test/CMakeLists.txt
+++ b/self_test/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(self_test)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED diagnostic_msgs diagnostic_updater roscpp rostest)
diff --git a/test_diagnostic_aggregator/CMakeLists.txt b/test_diagnostic_aggregator/CMakeLists.txt
index f612e5de2..fad7bb0c3 100644
--- a/test_diagnostic_aggregator/CMakeLists.txt
+++ b/test_diagnostic_aggregator/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.5)
 project(test_diagnostic_aggregator)
 
-# Support C++11
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+# Support C++14
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 # Load catkin and all dependencies required for this package
 #find_package(catkin REQUIRED diagnostic_aggregator diagnostic_msgs pluginlib roscpp rospy rostest)