diff --git a/ChangeLog b/ChangeLog
index 17fbfb7278..331537a82b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-02  Sven Neumann  <sven@gimp.org>
+
+	* libgimpthumb/gimpthumbnail.c (gimp_thumbnail_save_thumb): use
+	the UTF-encoded URI in error messages, not the filename.
+
+	* app/Makefile.am: use $(EXEEXT) for dist-hook binary dependency.
+	
+	* tools/gimp-remote.c: include <unistd.h> conditionally.
+
 2004-02-02  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpimagedock.c (gimp_image_dock_constructor):
diff --git a/app/Makefile.am b/app/Makefile.am
index 0edd29dc0f..19117f0c66 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -167,6 +167,6 @@ endif
 # hooks to assure that the system gimprc and the gimprc manpage are
 # uptodate when a release is made
 
-dist-hook: gimp-@GIMP_APP_VERSION@
+dist-hook: gimp-$(GIMP_APP_VERSION)$(EXEEXT)
 	./$< --dump-gimprc-system > $(top_srcdir)/etc/gimprc
 	./$< --dump-gimprc-manpage > $(top_srcdir)/docs/gimprc-$(GIMP_APP_VERSION).5.in
diff --git a/libgimpthumb/gimpthumbnail.c b/libgimpthumb/gimpthumbnail.c
index 95ffa05c9a..895058d86b 100644
--- a/libgimpthumb/gimpthumbnail.c
+++ b/libgimpthumb/gimpthumbnail.c
@@ -883,8 +883,8 @@ gimp_thumbnail_save_thumb (GimpThumbnail  *thumbnail,
 
       if (! success)
         g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
-                     "Could not set permissions of thumbnail '%s': %s",
-                     name, g_strerror (errno));
+                     "Could not set permissions of thumbnail for %s: %s",
+                     thumbnail->image_uri, g_strerror (errno));
     }
 
   g_free (num_str);
diff --git a/tools/gimp-remote.c b/tools/gimp-remote.c
index 9d24fefe2a..c24d66999e 100644
--- a/tools/gimp-remote.c
+++ b/tools/gimp-remote.c
@@ -37,10 +37,13 @@
 
 #include "config.h"
 
-#include <errno.h>
-#include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>