diff --git a/tmux.c b/tmux.c
index 34416e30..65772f92 100644
--- a/tmux.c
+++ b/tmux.c
@@ -79,8 +79,7 @@ logfile(const char *name)
 
 	log_close();
 	if (debug_level > 0) {
-		xasprintf(
-		    &path, "%s-%s-%ld.log", __progname, name, (long) getpid());
+		xasprintf(&path, "tmux-%s-%ld.log", name, (long) getpid());
 		log_open_file(debug_level, path);
 		xfree(path);
 	}
@@ -184,7 +183,7 @@ makesockpath(const char *label)
 	u_int		uid;
 
 	uid = getuid();
-	xsnprintf(base, MAXPATHLEN, "%s/%s-%d", _PATH_TMP, __progname, uid);
+	xsnprintf(base, MAXPATHLEN, "%s/tmux-%d", _PATH_TMP, uid);
 
 	if (mkdir(base, S_IRWXU) != 0 && errno != EEXIST)
 		return (NULL);
diff --git a/window.c b/window.c
index d24d789b..cfef2b24 100644
--- a/window.c
+++ b/window.c
@@ -62,6 +62,7 @@ const char *
 window_default_command(void)
 {
 	const char	*shell, *ptr;
+	char		*progname;
 	struct passwd	*pw;
 
 	shell = getenv("SHELL");
@@ -81,7 +82,10 @@ found:
 		ptr++;
 	else
 		ptr = shell;
-	if (strcmp(ptr, __progname) == 0)
+	progname = __progname;
+	if (*progname == '-')
+		progname++;
+	if (strcmp(ptr, progname) == 0)
 		return (_PATH_BSHELL);
 	return (shell);
 }