diff --git a/main/pbx.c b/main/pbx.c
index b4f6599d9e..59e4a3697e 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -949,6 +949,11 @@ int pbx_exec(struct ast_channel *c, 		/*!< Channel */
 	c->data = data;
 	if (app->module)
 		u = __ast_module_user_add(app->module, c);
+	if (!ast_strlen_zero(data) && strchr(data, '|') && !strchr(data, ',')) {
+		ast_log(LOG_WARNING, "The application delimiter is now the comma, not "
+			"the pipe.  Did you forget to convert your dialplan?  (%s(%s))\n",
+			app->name, (char *) data);
+	}
 	res = app->execute(c, S_OR(data, ""));
 	if (app->module && u)
 		__ast_module_user_remove(app->module, u);