diff --git a/cpp/gigasecond/CMakeLists.txt b/cpp/gigasecond/CMakeLists.txt
new file mode 100644
index 0000000..56a3675
--- /dev/null
+++ b/cpp/gigasecond/CMakeLists.txt
@@ -0,0 +1,59 @@
+# 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()
+
+# Include a test helper header if it exists
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/require_equal_containers.h)
+    set(test_helper require_equal_containers.h)
+else()
+    set(test_helper "")
+endif()
+
+# Build executable from sources and headers
+add_executable(${exercise} ${file}_test.cpp ${test_helper} ${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/gigasecond/README.md b/cpp/gigasecond/README.md
new file mode 100644
index 0000000..526eba4
--- /dev/null
+++ b/cpp/gigasecond/README.md
@@ -0,0 +1,41 @@
+# Gigasecond
+
+Write a program that will calculate the date that someone turned or will celebrate their 1 Gs anniversary.
+
+A gigasecond is one billion (10**9) seconds.
+
+## 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
+
+Chapter 9 in Chris Pine's online Learn to Program tutorial. [view source](http://pine.fm/LearnToProgram/?Chapter=09)
diff --git a/cpp/gigasecond/gigasecond.h b/cpp/gigasecond/gigasecond.h
new file mode 100644
index 0000000..48759bd
--- /dev/null
+++ b/cpp/gigasecond/gigasecond.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#define EXERCISM_RUN_ALL_TESTS
+
+#include <boost/date_time/gregorian/gregorian.hpp>
+
+
+namespace gigasecond {
+
+typedef boost::gregorian::date              date_t;
+typedef boost::gregorian::date_duration     date_duration_t;
+
+static inline date_t advance(date_t date)
+{
+    return date + date_duration_t(1000000000 / (60*60*24));
+}
+
+}
diff --git a/cpp/gigasecond/gigasecond_test.cpp b/cpp/gigasecond/gigasecond_test.cpp
new file mode 100644
index 0000000..79cb452
--- /dev/null
+++ b/cpp/gigasecond/gigasecond_test.cpp
@@ -0,0 +1,32 @@
+#include "gigasecond.h"
+#define BOOST_TEST_MAIN
+#include <boost/test/unit_test.hpp>
+
+// See <http://www.boost.org/doc/libs/1_55_0/doc/html/date_time.html>
+// for documentation on boost::gregorian::date
+
+BOOST_AUTO_TEST_CASE(test_1)
+{
+    const auto actual = gigasecond::advance(boost::gregorian::date(2011, 4, 26));
+
+    const boost::gregorian::date expected(2043, 1, 2);
+    BOOST_REQUIRE_EQUAL(expected, actual);
+}
+
+#if defined(EXERCISM_RUN_ALL_TESTS)
+BOOST_AUTO_TEST_CASE(test_2)
+{
+    const auto actual = gigasecond::advance(boost::gregorian::date(1977, 6, 14));
+
+    const boost::gregorian::date expected(2009, 2, 20);
+    BOOST_REQUIRE_EQUAL(expected, actual);
+}
+
+BOOST_AUTO_TEST_CASE(test_3)
+{
+    const auto actual = gigasecond::advance(boost::gregorian::date(1959, 7, 20));
+
+    const boost::gregorian::date expected(1991, 3, 28);
+    BOOST_REQUIRE_EQUAL(expected, actual);
+}
+#endif