diff --git a/cmd-break-pane.c b/cmd-break-pane.c
index a5d4e148..c949fe8a 100644
--- a/cmd-break-pane.c
+++ b/cmd-break-pane.c
@@ -34,8 +34,8 @@ const struct cmd_entry cmd_break_pane_entry = {
 	.name = "break-pane",
 	.alias = "breakp",
 
-	.args = { "dPF:s:t:", 0, 0 },
-	.usage = "[-dP] [-F format] [-s src-pane] [-t dst-window]",
+	.args = { "dPF:n:s:t:", 0, 0 },
+	.usage = "[-dP] [-F format] [-n window-name] [-s src-pane] [-t dst-window]",
 
 	.sflag = CMD_PANE,
 	.tflag = CMD_WINDOW_INDEX,
@@ -53,8 +53,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	struct session		*dst_s = item->state.tflag.s;
 	struct window_pane	*wp = item->state.sflag.wp;
 	struct window		*w = wl->window;
-	char			*name;
-	char			*cause;
+	char			*name, *cause;
 	int			 idx = item->state.tflag.idx;
 	struct format_tree	*ft;
 	const char		*template;
@@ -78,9 +77,16 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
 	w = wp->window = window_create(dst_s->sx, dst_s->sy);
 	TAILQ_INSERT_HEAD(&w->panes, wp, entry);
 	w->active = wp;
-	name = default_window_name(w);
-	window_set_name(w, name);
-	free(name);
+
+	if (!args_has(args, 'n')) {
+		name = default_window_name(w);
+		window_set_name(w, name);
+		free(name);
+	} else {
+		window_set_name(w, args_get(args, 'n'));
+		options_set_number(w->options, "automatic-rename", 0);
+	}
+
 	layout_init(w, wp);
 	wp->flags |= PANE_CHANGED;
 
diff --git a/cmd-source-file.c b/cmd-source-file.c
index 4ca47193..dce72c40 100644
--- a/cmd-source-file.c
+++ b/cmd-source-file.c
@@ -53,7 +53,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 	struct cmdq_item	*new_item;
 	enum cmd_retval		 retval;
 	glob_t			 g;
-	int			 i;
+	u_int			 i;
 
 	quiet = args_has(args, 'q');
 	if (glob(args->argv[0], 0, NULL, &g) != 0) {
@@ -64,7 +64,7 @@ cmd_source_file_exec(struct cmd *self, struct cmdq_item *item)
 	}
 
 	retval = CMD_RETURN_NORMAL;
-	for (i = 0; i < g.gl_pathc; i++) {
+	for (i = 0; i < (u_int)g.gl_pathc; i++) {
 		if (load_cfg(g.gl_pathv[i], c, item, quiet) != 0)
 			retval = CMD_RETURN_ERROR;
 	}
diff --git a/tmux.1 b/tmux.1
index cc5c2373..fdbab7b1 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1258,6 +1258,7 @@ Commands related to windows and panes are as follows:
 .It Xo Ic break-pane
 .Op Fl dP
 .Op Fl F Ar format
+.Op Fl n Ar window-name
 .Op Fl s Ar src-pane
 .Op Fl t Ar dst-window
 .Xc