diff --git a/lib/B/CC.pm b/lib/B/CC.pm
index d449f6eb5..c93f085fd 100644
--- a/lib/B/CC.pm
+++ b/lib/B/CC.pm
@@ -370,6 +370,8 @@ my %optimise = (
 );
 my %async_signals = map { $_ => 1 } # 5.14 ops which do PERL_ASYNC_CHECK
   qw(wait waitpid nextstate and cond_expr unstack or subst dorassign);
+$async_signals{$_} = 1 for # more 5.16 ops which do PERL_ASYNC_CHECK
+  qw(substcont next redo goto leavewhen);
 # perl patchlevel to generate code for (defaults to current patchlevel)
 my $patchlevel = int( 0.5 + 1000 * ( $] - 5 ) );    # XXX unused?
 my $MULTI      = $Config{usemultiplicity};