diff --git a/bin/caam b/bin/caam
index 31273bc..63586cc 100755
--- a/bin/caam
+++ b/bin/caam
@@ -1,8 +1,8 @@
 #!/bin/sh
 # caam - Configure And And Make
 # (C)2008-2011 by HIROSE, Yuuji [yuuji/at/gentei.org]
-# Last modified Sun Feb 19 11:57:20 2012 on firestorm
-# Update count: 17
+# Last modified Wed Feb 22 10:53:24 2012 on firestorm
+# Update count: 35
 # http://www.gentei.org/~yuuji/software/caam/
 
 ca=`echo $CAAM_ADD|tr : ' '`
@@ -157,16 +157,30 @@
   [ -s $logfile ] || echo "### $logfile started at `date`" > $logfile
   (echo 1i
    echo "# ** $uname ** - $myname succeeded at `date`"
-   echo 'if [ x"`uname -sm`" = x"'$uname'" ]; then'
+   cat <<EOF
+if [ x"\`uname -sm\`" = x"$uname" ]; then
+  if [ x"\$1" = x"-n" ]; then
+    shift; DO() {
+      echo "\$@"|sed "s,\$PATH,\\\$PATH,"|sed 's/PATH=\\\$PATH //'
+    }
+  else
+    DO() { eval "\$@";}
+  fi
+  DO \\
+EOF
    for e in $kept_env; do
      eval v="\$old_$e"
-     echo $e=\"$v\" \\
+     echo "  "$e=\"$v\" \\
    done
-   echo $myname $myargs '"$@"'
-   echo exit
+   echo "  $myname" $myargs '"$@"'
+   echo "  exit"
    echo "fi"
    echo "#### ** $uname Success log ends here."
    echo .; echo w; echo q) | ed $logfile 2> /dev/null
+
+   echo "Saved caam log in $logfile."
+   echo "To build again with same parameters:    sh $logfile"
+   echo "To see successfull caam arguments:      sh $logfile -n"
   )
   exit $status
 }