diff --git a/include/trajectory.h b/include/trajectory.h
index f8ac075dcf371df85060ca1553a33af1a45e745b..54743f6a54f04a4032d5daeb9303c85f715535cd 100644
--- a/include/trajectory.h
+++ b/include/trajectory.h
@@ -623,7 +623,7 @@ class CTrajectory
 	  }
 	  // load the new trajectory
           std::cout << "read file " << filename << std::endl;
-	  std::auto_ptr<traj_t> traj(trajectory(filename.c_str(),xml_schema::flags::dont_validate));
+	  std::unique_ptr<traj_t> traj(trajectory(filename.c_str(),xml_schema::flags::dont_validate));
 	  if(traj->num_motors()!=(this->motor_control->*this->get_num_motors_fnct)())
 	  {
 	    this->motion_access.exit();
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 8de9af83fed294b0ce3837c191fc291147e9f487..9f35d7d4aeb38f9aa5624db2c1cdfd2c813a6522 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -36,7 +36,7 @@ IF(XSD_FOUND)
       ADD_CUSTOM_TARGET(xsd_files_gen DEPENDS ${XSD_SOURCES_INT})
       ADD_CUSTOM_COMMAND(
          OUTPUT ${XSD_SOURCES_INT}
-         COMMAND xsdcxx cxx-tree --generate-serialization ${XSD_FILES}
+         COMMAND xsdcxx cxx-tree --std c++11 --generate-serialization ${XSD_FILES}
          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
          DEPENDS ${XSD_PATH_FILES}
          COMMENT "Parsing the xml template file ${XSD_FILES}")