diff --git a/ChangeLog b/ChangeLog
index e2fdc5396..13c6cf489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-07-08  Jim Meyering  <jim@meyering.net>
 
+	Adapt to deeper hierarchy in gnulib.
+	* bootstrap (gnulib_tool): If the destination directory doesn't exist,
+	create it. This is required at least for "lib/uniwidth/cjk.h".
+
 	Use <wchar.h>, not "wcwidth.h".
 	* src/wc.c: Now that gnulib provides the POSIX-specified <wchar.h>,
 	include it and <wctype.h>, rather than "wcwidth.h".
diff --git a/bootstrap b/bootstrap
index 16a308543..8382eb895 100755
--- a/bootstrap
+++ b/bootstrap
@@ -284,6 +284,12 @@ symlink_to_gnulib()
   dst=${2-$1}
 
   test -f "$src" && {
+
+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$dst"`
+    test -d "$dst_dir" || mkdir -p "$dst_dir"
+
     if $copy; then
       {
 	test ! -h "$dst" || {