diff --git a/ChangeLog b/ChangeLog
index 0f73192055..35d44fc7a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 15 15:16:14 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (install-rdoc), configure.in (RDOCTARGET): removed
+	  circular dependency.  [ruby-dev:39339]
+
 Tue Sep 15 15:09:13 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/configure.bat: need a space before a tab to output the tab by
diff --git a/common.mk b/common.mk
index 946e5ed1f0..dc4846df64 100644
--- a/common.mk
+++ b/common.mk
@@ -173,6 +173,7 @@ ruby.imp: $(EXPORTOBJS)
 	@$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
 install: install-$(RDOCTARGET)
+install-rdoc: install-all
 doc-all: rdoc capi
 
 install-all: doc-all pre-install-all do-install-all post-install-all
diff --git a/configure.in b/configure.in
index 03a03050e5..2221281c3c 100644
--- a/configure.in
+++ b/configure.in
@@ -2127,7 +2127,7 @@ AC_ARG_ENABLE(install-doc,
        AS_HELP_STRING([--disable-install-doc], [do not install rdoc indexes during install]),
        [install_doc=$enableval], [install_doc=yes])
 if test "$install_doc" != no; then
-    RDOCTARGET="all"
+    RDOCTARGET="rdoc"
 else
     RDOCTARGET="nodoc"
 fi