--- a/CHANGES	Fri Jun 12 21:54:32 2015 -0400
+++ b/CHANGES	Fri Jun 12 22:00:45 2015 -0400
@@ -1,10 +1,14 @@
 pending
+   - Fix a stupid regression in 0.5 that causes it to not recognize a
+     pile of options.
    - Fix output corruption caused by mishandling which macros are
      currently in use. In particular, "curmacro" is only valid while
      we're parsing a macro name and arguments, and can change once we
-     start expanding, so don't use it to clear the in-use flag.
+     start expanding, so don't use it to clear the in-use flag. This
+     problem has been around all along but was only just exposed.
    - Also don't set curmacro to null after calling expand_domacro as
      that can cause us to think a macro name we just read is defined().
+     This one was introduced in 0.5.
    - Don't use "remove" as a local variable as gcc 4.1 gets upset
      about it vs. remove(3) in stdio.h.
 

--- a/main.c	Fri Jun 12 21:54:32 2015 -0400
+++ b/main.c	Fri Jun 12 22:00:45 2015 -0400
@@ -782,7 +782,6 @@
 	{ "MG",                         &mode.depend_assume_generated, true },
 	{ "MP",                         &mode.depend_issue_fakerules,  true },
 	{ "P",                          &mode.output_linenumbers,      false },
-	{ "p",                          &mode.output_cheaplinenumbers, true },
 	{ "Wcomment",                   &warns.nestcomment,    true },
 	{ "Wendif-labels",              &warns.endiflabels,    true },
 	{ "Werror",                     &mode.werror,          true },
@@ -796,6 +795,7 @@
 	{ "fdollars-in-identifiers",    &mode.input_allow_dollars,     true },
 	{ "fno-dollars-in-identifiers", &mode.input_allow_dollars,     false },
 	{ "nostdinc",                   &mode.do_stdinc,               false },
+	{ "p",                          &mode.output_cheaplinenumbers, true },
 	{ "undef",                      &mode.do_stddef,               false },
 };
 static const unsigned num_flag_options = HOWMANY(flag_options);