diff --git a/examples/c/bistromathic/bistromathic.test b/examples/c/bistromathic/bistromathic.test
index ad614283..0bec1cb3 100755
--- a/examples/c/bistromathic/bistromathic.test
+++ b/examples/c/bistromathic/bistromathic.test
@@ -86,11 +86,11 @@ run 0 '> 1 / 0
 ## ------------ ##
 
 sed -e 's/\\t/	/g' >input <<EOF
-( 1 + \t\t
+(1+\t\t
 EOF
-run 0 '> ( 1 + 
+run 0 '> (1+
 (                        cos                      ln
 -                        double precision number  sin
 atan                     exp                      sqrt
-> ( 1 + 
-> err: 1.7: syntax error: expected - or ( or double precision number or function or variable before end of file'
+> (1+
+> err: 1.4: syntax error: expected - or ( or double precision number or function or variable before end of file'
diff --git a/examples/c/bistromathic/parse.y b/examples/c/bistromathic/parse.y
index 971f9b56..d424cdfe 100644
--- a/examples/c/bistromathic/parse.y
+++ b/examples/c/bistromathic/parse.y
@@ -426,11 +426,15 @@ completion (const char *text, int start, int end)
 
 void init_readline (void)
 {
-  /* Allow conditional parsing of the ~/.inputrc file. */
-  rl_readline_name = "pushcalc";
+  // Allow conditional parsing of the ~/.inputrc file.
+  rl_readline_name = "bistromathic";
 
-  /* Tell the completer that we want a crack first. */
+  // Tell the completer that we want a crack first.
   rl_attempted_completion_function = completion;
+
+  // The basic list of characters that signal a break between words
+  // for the completer routine.
+  rl_basic_word_break_characters = " \t\n\"\\'`@$><=;|&{(+-*/^)";
 }