diff --git a/ChangeLog b/ChangeLog
index 4d1ad24..1eb8921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-24  Lucas Rocha  <lucasr@cvs.gnome.org>
+
+	* src/option.c: fixed bug #317033.
+
 2005-09-21  Guilherme de S. Pastore  <gpastore@cvs.gnome.org>
 
 	* data/zenity.1: escaped "-"s; they're supposed to be
diff --git a/src/option.c b/src/option.c
index c8640f3..1908930 100644
--- a/src/option.c
+++ b/src/option.c
@@ -211,7 +211,7 @@ static GOptionEntry entry_options[] = {
     "text",
     '\0',
     G_OPTION_FLAG_NOALIAS,
-    G_OPTION_ARG_STRING,
+    G_OPTION_ARG_STRING | G_OPTION_FLAG_NOALIAS,
     &zenity_general_dialog_text,
     N_("Set the dialog text"),
     NULL
@@ -220,7 +220,7 @@ static GOptionEntry entry_options[] = {
     "entry-text",
     '\0',
     0,
-    G_OPTION_ARG_STRING | G_OPTION_FLAG_NOALIAS,
+    G_OPTION_ARG_STRING,
     &zenity_entry_entry_text,
     N_("Set the entry text"),
     NULL