diff --git a/GildedRose/cpp/Makefile b/GildedRose/cpp/Makefile
new file mode 100644
index 00000000..f6f284a1
--- /dev/null
+++ b/GildedRose/cpp/Makefile
@@ -0,0 +1,75 @@
+# Makefile for building the kata file with the Google Testing Framework
+#
+# SYNOPSIS:
+#
+#   make [all]  - makes everything.
+#   make TARGET - makes the given target.
+#   make clean  - removes all files generated by make.
+
+# Please tweak the following variable definitions as needed by your
+# project, except GTEST_HEADERS, which you can use in your own targets
+# but shouldn't modify.
+
+# Points to the root of Google Test, relative to where this file is.
+# Remember to tweak this if you move this file.
+GTEST_DIR = gtest
+
+# Where to find user code.
+USER_DIR = .
+
+# Flags passed to the preprocessor.
+CPPFLAGS += -I$(GTEST_DIR)/include
+
+# Flags passed to the C++ compiler.
+CXXFLAGS += -g -Wall -Wextra
+
+# All tests produced by this Makefile.  Remember to add new tests you
+# created to the list.
+TESTS = GildedRose
+
+# All Google Test headers.  Usually you shouldn't change this
+# definition.
+GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
+                $(GTEST_DIR)/include/gtest/internal/*.h
+
+# House-keeping build targets.
+
+all : $(TESTS)
+
+clean :
+	rm -f $(TESTS) gtest.a gtest_main.a *.o
+
+# Builds gtest.a and gtest_main.a.
+
+# Usually you shouldn't tweak such internal variables, indicated by a
+# trailing _.
+GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+
+# For simplicity and to avoid depending on Google Test's
+# implementation details, the dependencies specified below are
+# conservative and not optimized.  This is fine as Google Test
+# compiles fast and for ordinary users its source rarely changes.
+gtest-all.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+            $(GTEST_DIR)/src/gtest-all.cc
+
+gtest_main.o : $(GTEST_SRCS_)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c \
+            $(GTEST_DIR)/src/gtest_main.cc
+
+gtest.a : gtest-all.o
+	$(AR) $(ARFLAGS) $@ $^
+
+gtest_main.a : gtest-all.o gtest_main.o
+	$(AR) $(ARFLAGS) $@ $^
+
+# Builds a sample test.  A test should link with either gtest.a or
+# gtest_main.a, depending on whether it defines its own main()
+# function.
+
+GildedRose.o : $(USER_DIR)/GildedRose.cc \
+  $(GTEST_HEADERS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.cc
+
+GildedRose : GildedRose.o gtest_main.a
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
diff --git a/GildedRose/cpp/README b/GildedRose/cpp/README
new file mode 100644
index 00000000..5d4673a4
--- /dev/null
+++ b/GildedRose/cpp/README
@@ -0,0 +1,7 @@
+run-once.sh runs your tests once
+
+Assumptions:
+  - make and a C++ compiler (like gcc) is installed on your system and is in the PATH
+  - The GTest framework is in the directory gtest.
+  - If your IDE does the compilation and linking, you should remove the first 3 lines
+    in the run-once.sh file.
diff --git a/GildedRose/cpp/run-once.sh b/GildedRose/cpp/run-once.sh
new file mode 100755
index 00000000..7090228b
--- /dev/null
+++ b/GildedRose/cpp/run-once.sh
@@ -0,0 +1,4 @@
+rm GildedRose
+rm GildedRose.o
+make
+./GildedRose
\ No newline at end of file