diff --git a/Makefile b/Makefile
index 914b72d..e4a1761 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Works best with GNU make 3.80 or later
 
-VERSION = git-20171012
+VERSION = git-20171016
 
 srcdir = .
 
diff --git a/image.c b/image.c
index 6ace9bd..5d7f5cf 100644
--- a/image.c
+++ b/image.c
@@ -530,8 +530,15 @@ bool img_zoom(img_t *img, float z)
 	img->scalemode = SCALE_ZOOM;
 
 	if (zoomdiff(z, img->zoom) != 0) {
-		img->x = img->win->w / 2 - (img->win->w / 2 - img->x) * z / img->zoom;
-		img->y = img->win->h / 2 - (img->win->h / 2 - img->y) * z / img->zoom;
+		int x, y;
+
+		win_cursor_pos(img->win, &x, &y);
+		if (x < 0 || x >= img->win->w || y < 0 || y >= img->win->h) {
+			x = img->win->w / 2;
+			y = img->win->h / 2;
+		}
+		img->x = x - (x - img->x) * z / img->zoom;
+		img->y = y - (y - img->y) * z / img->zoom;
 		img->zoom = z;
 		img->checkpan = true;
 		img->dirty = true;