diff --git a/Makefile b/Makefile
index 3ec9ccf4..3d7834eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION   := git-20161201
+VERSION   := git-20161228
 
 PREFIX    := /usr/local
 MANPREFIX := $(PREFIX)/share/man
diff --git a/thumbs.c b/thumbs.c
index 43bb50ce..4f6c1814 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -232,11 +232,9 @@ Imlib_Image tns_scale_down(Imlib_Image im, int dim)
 
 bool tns_load(tns_t *tns, int n, bool force, bool cache_only)
 {
-	int w, h;
 	int maxwh = thumb_sizes[ARRLEN(thumb_sizes)-1];
 	bool cache_hit = false;
 	char *cfile;
-	float zw, zh;
 	thumb_t *t;
 	fileinfo_t *file;
 	struct stat st;
@@ -273,8 +271,9 @@ bool tns_load(tns_t *tns, int n, bool force, bool cache_only)
 			}
 #if HAVE_LIBEXIF
 		} else if (!force) {
-			int pw = 0, ph = 0, x = 0, y = 0;
+			int pw = 0, ph = 0, w, h, x = 0, y = 0;
 			bool err;
+			float zw, zh;
 			ExifData *ed;
 			ExifEntry *entry;
 			ExifContent *ifd;