diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index 3cbb4002..08eb7a5c 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -12,6 +12,22 @@ libmsgpack_la_SOURCES = \
 libmsgpack_la_LDFLAGS = -version-info 3:0:0
 
 
+# backward compatibility
+lib_LTLIBRARIES += libmsgpackc.la
+
+libmsgpackc_la_SOURCES = \
+		unpack.c \
+		objectc.c \
+		vrefbuffer.c \
+		zone.c
+
+libmsgpackc_la_LDFLAGS = -version-info 2:0:0
+
+# work around for duplicated file name
+kumo_manager_CFLAGS = $(AM_CFLAGS)
+kumo_manager_CXXFLAGS = $(AM_CXXFLAGS)
+
+
 nobase_include_HEADERS = \
 		msgpack/pack_define.h \
 		msgpack/pack_template.h \
diff --git a/cpp/test/Makefile.am b/cpp/test/Makefile.am
index a80f3194..2b966699 100644
--- a/cpp/test/Makefile.am
+++ b/cpp/test/Makefile.am
@@ -1,13 +1,15 @@
 
+AM_CPPFLAGS   = -I..
+AM_C_CPPFLAGS = -I..
 AM_LDFLAGS = ../libmsgpack.la -lgtest_main
 
 check_PROGRAMS = \
-	zone \
-	pack_unpack \
-	streaming \
-	object \
-	convert \
-	buffer
+		zone \
+		pack_unpack \
+		streaming \
+		object \
+		convert \
+		buffer
 
 TESTS = $(check_PROGRAMS)