diff --git a/ChangeLog b/ChangeLog
index cfa4be0e7e..71392ce86f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 23 19:01:18 2012  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_execarg_fixup): fix envopts condition.
+
 Sat Jun 23 18:44:13 2012  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (check_exec_redirect1): extracted from
diff --git a/process.c b/process.c
index a0c1c79a80..904e83cdbe 100644
--- a/process.c
+++ b/process.c
@@ -2147,7 +2147,7 @@ rb_execarg_fixup(VALUE execarg_obj)
             envtbl = rb_convert_type(envtbl, T_HASH, "Hash", "to_hash");
         }
         hide_obj(envtbl);
-        if (!NIL_P(envopts)) {
+        if (envopts != Qfalse) {
             st_table *stenv = RHASH_TBL(envtbl);
             long i;
             for (i = 0; i < RARRAY_LEN(envopts); i++) {