diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile
index 2045dba..f77c493 100644
--- a/lib/cpp/Makefile
+++ b/lib/cpp/Makefile
@@ -1,4 +1,9 @@
-# Makefile for Thrift C++ library.
+# Makefile for Thrift C++ library. Generates a shared object that can be
+# installed to /usr/local/lib
+#
+# TODO(mcslee): Add the ability to compile separate statis modules that can
+# be compiled directly into Thrift applications instead of dynamic runtime
+# loading of the full libs
 # 
 # Author:
 #   Mark Slee <mcslee@facebook.com>
@@ -10,16 +15,17 @@
 LDFL  = -shared -Wall -I. -fPIC -Wl,-soname=libthrift.so
 
 # Source files
-SRCS  = client/TSimpleClient.cc \
-	protocol/TBinaryProtocol.cc \
-	server/TSimpleServer.cc \
+SRCS  = protocol/TBinaryProtocol.cc \
+	transport/TBufferedTransport.cc \
 	transport/TSocket.cc \
-	transport/TServerSocket.cc
+	transport/TServerSocket.cc \
+	server/TSimpleServer.cc
 
 # Linked library
 libthrift:
 	$(LD) -o libthrift.so $(LDFL) $(SRCS)
 
+# Clean it up
 clean:
 	rm -f libthrift.so