diff --git a/test/cpp/Makefile b/test/cpp/Makefile
index 21c09ec..36abb43 100644
--- a/test/cpp/Makefile
+++ b/test/cpp/Makefile
@@ -12,19 +12,28 @@
 LD     = g++
 
 # Compiler flags
-LIBS  = ../../lib/cpp/server/TSimpleServer.cc \
-	../../lib/cpp/protocol/TBinaryProtocol.cc \
-	../../lib/cpp/transport/TBufferedTransport.cc \
-	../../lib/cpp/transport/TServerSocket.cc \
-	../../lib/cpp/transport/TSocket.cc
-CFL   = -Wall -O3 -Igen-cpp -I../../lib/cpp $(LIBS)
-CFL   = -Wall -O3 -Igen-cpp -I../../lib/cpp -lthrift
+LIBS  = ../../lib/cpp/src/server/TSimpleServer.cc \
+	../../lib/cpp/src/protocol/TBinaryProtocol.cc \
+	../../lib/cpp/src/transport/TBufferedTransport.cc \
+	../../lib/cpp/src/transport/TChunkedTransport.cc \
+	../../lib/cpp/src/transport/TServerSocket.cc \
+	../../lib/cpp/src/transport/TSocket.cc
+DCFL  = -Wall -O3 -g -Igen-cpp -I../../lib/cpp/src $(LIBS)
+CFL   = -Wall -O3 -Igen-cpp -I../../lib/cpp/src -lthrift
 
 all: server client
 
+debug: server-debug client-debug
+
 stubs: ../ThriftTest.thrift
 	$(THRIFT) -cpp ../ThriftTest.thrift
 
+server-debug: stubs
+	g++ -o TestServer $(DCFL) src/TestServer.cc gen-cpp/ThriftTest.cc
+
+client-debug: stubs
+	g++ -o TestClient $(DCFL) src/TestClient.cc gen-cpp/ThriftTest.cc
+
 server: stubs
 	g++ -o TestServer $(CFL) src/TestServer.cc gen-cpp/ThriftTest.cc