--- popt.c	9 Mar 2008 20:24:45 -0000	1.119
+++ popt.c	9 Mar 2008 22:15:08 -0000
@@ -931,11 +931,11 @@ int poptGetNextOpt(poptContext con)
 	    shorty = 1;
 
 	    origOptString++;
-	    if (*origOptString != '\0')
+	    if (*origOptString != '\0') {
+		if (*origOptString == '=')
+		    origOptString++;
 		con->os->nextCharArg = origOptString;
-#ifdef	NOTYET	/* XXX causes test 9 failure. */
-		con->os->nextCharArg = origOptString + (*origOptString == '=');
-#endif
+	    }
 	}
 
 	if (opt == NULL) return POPT_ERROR_BADOPT;	/* XXX can't happen */