diff --git a/man/feh.pre b/man/feh.pre
index 7ff69cfe15751ea94af2c99eef9a70704148e6a8..f59d082d7dfb184eb4b43eab2203137e133e0a81 100644
--- a/man/feh.pre
+++ b/man/feh.pre
@@ -594,7 +594,7 @@ image.
 .
 Save files to
 .Ar directory
-.Pq only useful with -k .
+.Pq only useful with -k , -o / -O or the save_image command .
 By default, files are saved in the current working directory.
 .
 .It Cm -p , --preload
diff --git a/src/slideshow.c b/src/slideshow.c
index b4043184442a3357fcf6cf57af9601d3cf6d7e20..19aeaee1d3d5ef77e77d18e1328d46fc7a50b22e 100644
--- a/src/slideshow.c
+++ b/src/slideshow.c
@@ -615,18 +615,21 @@ void slideshow_save_image(winwidget win)
 {
 	char *tmpname;
 	Imlib_Load_Error err;
+	char *base_dir = estrjoin("", opt.output_dir ? opt.output_dir : "", "/", NULL);
 
 	if (win->file) {
-		tmpname = feh_unique_filename("", FEH_FILE(win->file->data)->name);
+		tmpname = feh_unique_filename(base_dir, FEH_FILE(win->file->data)->name);
 	} else if (mode) {
 		char *tmp;
 		tmp = estrjoin(".", mode, "png", NULL);
-		tmpname = feh_unique_filename("", tmp);
+		tmpname = feh_unique_filename(base_dir, tmp);
 		free(tmp);
 	} else {
-		tmpname = feh_unique_filename("", "noname.png");
+		tmpname = feh_unique_filename(base_dir, "noname.png");
 	}
 
+	free(base_dir);
+
 	if (opt.verbose)
 		fprintf(stderr, "saving image to filename '%s'\n", tmpname);