diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index c09f68643ce..9973adddabc 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -338,7 +338,8 @@ void addImageExtension(char *string)
 			extension= ".bmp";
 	}
 	else if(G.have_libtiff && (G.scene->r.imtype==R_TIFF)) {
-		extension= ".tif";
+		if(!BLI_testextensie(string, ".tif"))
+			extension= ".tif";
 	}
 	
 	strcat(string, extension);
diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile
index 6bcbab59da4..963031d9686 100644
--- a/source/gameengine/Ketsji/Makefile
+++ b/source/gameengine/Ketsji/Makefile
@@ -58,6 +58,7 @@ CPPFLAGS += -I../Physics/Bullet
 CPPFLAGS += -I.
 CPPFLAGS += -I../Converter
 CPPFLAGS += -I../../blender/blenkernel
+CPPFLAGS += -I../../blender/blenlib
 CPPFLAGS += -I../../blender/include
 CPPFLAGS += -I../../blender/makesdna
 CPPFLAGS += -I../../blender/imbuf