diff --git a/Makefile.am b/Makefile.am
index 31449727..be3d75f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
 if ENABLE_CXX
-export ERB
 SUBDIRS = c cpp
 else
 SUBDIRS = c
diff --git a/README b/README
index 2a1a3e05..66ca2765 100644
--- a/README
+++ b/README
@@ -8,9 +8,7 @@ Binary-based efficient data interchange format.
   MessagePack is only tested on Linux and Mac OS X, but it may run on other
   UNIX-like platforms.
 
-  Following programs are required to build:
-    - gcc >= 4.1 with C++ support
-    - ruby >= 1.8   (ruby is used as a preprocessor)
+  gcc >= 4.1 is required to build.
 
 
 *Installation
diff --git a/bootstrap b/bootstrap
index 9ddb3da3..8ac504bf 100755
--- a/bootstrap
+++ b/bootstrap
@@ -31,11 +31,8 @@ if test x"$1" = x"--help"; then
 fi
 
 
-#if [ -z "$NO_NEST" ];then
-#	cd c   && ./bootstrap $@; cd ..
-#	cd cpp && ./bootstrap $@; cd ..
-#fi
 mkdir -p ac
+(cd cpp && ./preprocess.sh $@; cd ..)
 
 
 ACLOCAL="aclocal"
diff --git a/configure.in b/configure.in
index c241ecfc..de71fc9a 100644
--- a/configure.in
+++ b/configure.in
@@ -23,11 +23,6 @@ if test "$enable_cxx" != "no"; then
 	if test "" = "$CXXFLAGS"; then
 		CXXFLAGS="-g -O4"
 	fi
-	
-	AC_CHECK_PROG(ERB, erb, erb)
-	if test "x$ERB" = x; then
-		AC_MSG_ERROR([cannot find erb. Ruby is needed to build.])
-	fi
 fi
 
 # FIXME
diff --git a/cpp/Makefile.am b/cpp/Makefile.am
index f9d1fec5..2c115353 100644
--- a/cpp/Makefile.am
+++ b/cpp/Makefile.am
@@ -27,31 +27,6 @@ nobase_include_HEADERS = \
 		msgpack/type/tuple.hpp \
 		msgpack/type/define.hpp
 
-# FIXME
-object.lo: msgpack/type/tuple.hpp msgpack/type/define.hpp msgpack/zone.hpp
-
-msgpack/type/tuple.hpp: msgpack/type/tuple.hpp.erb
-	$(ERB) $< > $@.tmp
-	mv $@.tmp $@
-
-msgpack/type/define.hpp: msgpack/type/define.hpp.erb
-	$(ERB) $< > $@.tmp
-	mv $@.tmp $@
-
-msgpack/zone.hpp: msgpack/zone.hpp.erb
-	$(ERB) $< > $@.tmp
-	mv $@.tmp $@
-
-MOSTLYCLEANFILES = \
-		msgpack/type/tuple.hpp \
-		msgpack/type/define.hpp \
-		msgpack/zone.hpp
-
-EXTRA_DIST = \
-		msgpack/type/tuple.hpp.erb \
-		msgpack/type/define.hpp.erb \
-		msgpack/zone.hpp.erb
-
 libmsgpack_la_LIBADD = -L../c -lmsgpackc
 
 # -version-info CURRENT:REVISION:AGE