diff --git a/cpp/robot-name/CMakeLists.txt b/cpp/robot-name/CMakeLists.txt
new file mode 100644
index 0000000..95c7011
--- /dev/null
+++ b/cpp/robot-name/CMakeLists.txt
@@ -0,0 +1,52 @@
+# Get the exercise name from the current directory
+get_filename_component(exercise ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+
+# Basic CMake project
+cmake_minimum_required(VERSION 2.8.11)
+
+# Name the project after the exercise
+project(${exercise} CXX)
+
+# Locate Boost libraries: unit_test_framework, date_time and regex
+set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost 1.55 REQUIRED COMPONENTS unit_test_framework date_time regex)
+
+# Enable C++11 features on gcc/clang
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "(GNU|Clang)")
+    set(CMAKE_CXX_FLAGS "-std=c++11")
+endif()
+
+# Configure to run all the tests?
+if(${EXERCISM_RUN_ALL_TESTS})
+    add_definitions(-DEXERCISM_RUN_ALL_TESTS)
+endif()
+
+# Get a source filename from the exercise name by replacing -'s with _'s
+string(REPLACE "-" "_" file ${exercise})
+
+# Implementation could be only a header
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.cpp)
+    set(exercise_cpp ${file}.cpp)
+else()
+    set(exercise_cpp "")
+endif()
+
+# Build executable from sources and headers
+add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h)
+
+# We need boost includes
+target_include_directories(${exercise} PRIVATE ${Boost_INCLUDE_DIRS})
+
+# We need boost libraries
+target_link_libraries(${exercise} ${Boost_LIBRARIES})
+
+# Tell MSVC not to warn us about unchecked iterators in debug builds
+if(${MSVC})
+    set_target_properties(${exercise} PROPERTIES
+        COMPILE_DEFINITIONS_DEBUG _SCL_SECURE_NO_WARNINGS)
+endif()
+
+# Run the tests on every build
+add_custom_command(TARGET ${exercise} POST_BUILD COMMAND ${exercise})
diff --git a/cpp/robot-name/README.md b/cpp/robot-name/README.md
new file mode 100644
index 0000000..f7afae9
--- /dev/null
+++ b/cpp/robot-name/README.md
@@ -0,0 +1,53 @@
+# Robot Name
+
+Write a program that manages robot factory settings.
+
+When robots come off the factory floor, they have no name.
+
+The first time you boot them up, a random name is generated, such as
+RX837 or BC811.
+
+Every once in a while we need to reset a robot to its factory settings,
+which means that their name gets wiped. The next time you ask, it will
+respond with a new random name.
+
+The names must be random: they should not follow a predictable sequence.
+Random names means a risk of collisions. Your solution should not allow
+the use of the same name twice when avoidable. In some exercism language
+tracks there are tests to ensure that the same name is never used twice.
+
+## Getting Started
+
+Make sure you have read the [getting started with C++](http://help.exercism.io/getting-started-with-cpp.html)
+page on the [exercism help site](http://help.exercism.io/).  This covers
+the basic information on setting up the development environment expected
+by the exercises.
+
+## Passing the Tests
+
+Get the first test compiling, linking and passing by following the [three
+rules of test-driven development](http://butunclebob.com/ArticleS.UncleBob.TheThreeRulesOfTdd).
+Create just enough structure by declaring namespaces, functions, classes,
+etc., to satisfy any compiler errors and get the test to fail.  Then write
+just enough code to get the test to pass.  Once you've done that,
+uncomment the next test by moving the following line past the next test.
+
+```C++
+#if defined(EXERCISM_RUN_ALL_TESTS)
+```
+
+This may result in compile errors as new constructs may be invoked that
+you haven't yet declared or defined.  Again, fix the compile errors minimally
+to get a failing test, then change the code minimally to pass the test,
+refactor your implementation for readability and expressiveness and then
+go on to the next test.
+
+Try to use standard C++11 facilities in preference to writing your own
+low-level algorithms or facilities by hand.  [CppReference](http://en.cppreference.com/)
+is a wiki reference to the C++ language and standard library.  If you
+are new to C++, but have programmed in C, beware of
+[C traps and pitfalls](http://www.slideshare.net/LegalizeAdulthood/c-traps-and-pitfalls-for-c-programmers).
+
+## Source
+
+A debugging session with Paul Blackwell at gSchool. [view source](http://gschool.it)
diff --git a/cpp/robot-name/robot_name_test.cpp b/cpp/robot-name/robot_name_test.cpp
new file mode 100644
index 0000000..cb20eaf
--- /dev/null
+++ b/cpp/robot-name/robot_name_test.cpp
@@ -0,0 +1,57 @@
+#include "robot_name.h"
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+#include <boost/regex.hpp>
+
+using namespace std;
+
+namespace
+{
+const boost::regex name_pattern{R"name(^[[:alpha:]]{2}\d{3}$)name"};
+}
+
+BOOST_AUTO_TEST_CASE(has_a_name)
+{
+    const robot_name::robot robot;
+
+    BOOST_REQUIRE(boost::regex_match(robot.name(), name_pattern));
+}
+
+#if defined(EXERCISM_RUN_ALL_TESTS)
+BOOST_AUTO_TEST_CASE(name_is_the_same_each_time)
+{
+    const robot_name::robot robot;
+
+    BOOST_REQUIRE_EQUAL(robot.name(), robot.name());
+}
+
+BOOST_AUTO_TEST_CASE(different_robots_have_different_names)
+{
+    const robot_name::robot robot_one;
+    const robot_name::robot robot_two;
+
+    BOOST_REQUIRE_NE(robot_one.name(), robot_two.name());
+}
+
+BOOST_AUTO_TEST_CASE(is_able_to_reset_name)
+{
+    robot_name::robot robot;
+    const auto original_name = robot.name();
+
+    robot.reset();
+
+    BOOST_REQUIRE_NE(original_name, robot.name());
+}
+
+BOOST_AUTO_TEST_CASE(exhausting_digits_yields_different_names)
+{
+    robot_name::robot robot;
+    auto last_name = robot.name();
+
+    for (int i = 0; i < 1000; ++i) {
+        robot.reset();
+        BOOST_REQUIRE_NE(last_name, robot.name());
+        BOOST_REQUIRE(boost::regex_match(robot.name(), name_pattern));
+    }
+}
+#endif