diff --git a/ChangeLog b/ChangeLog
index 6a4db39e32c5078829c6733280b690619948d846..3ad98748b9b7a92953cf41ffff20832c27ccf33b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-28	Benedikt Meurer <benny@xfce.org>
+
+	* thunar-vfs/thunar-vfs-mime-cache.c(thunar_vfs_mime_cache_finalize):
+	  Fix compiler warning if mmap() is not available.
+	* configure.in.in, thunar/Makefile.am: Do not install the symlink from
+	  thunar to Thunar on Win32 platforms. Bug #2432.
+
 2006-10-28	Benedikt Meurer <benny@xfce.org>
 
 	* thunar-vfs/thunar-vfs-io-local.c(_thunar_vfs_io_local_get_free_space):
diff --git a/configure.in.in b/configure.in.in
index 2b61d288ca05391fd648b439a36c4d8bce2624de..cb756024c405d4db0c1e6747744b6bffea66b270 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -49,6 +49,21 @@ AC_AIX()
 AC_ISC_POSIX()
 AC_MINIX()
 
+dnl ********************************
+dnl *** Check for Win32 variants ***
+dnl ********************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+*-*-mingw*|*-*-cygwin*)
+  ac_bm_platform_win32=yes
+  ;;
+*)
+  ac_bm_platform_win32=no
+  ;;
+esac
+AC_MSG_RESULT([$ac_bm_platform_win32])
+AM_CONDITIONAL([PLATFORM_WIN32], [test x"$ac_bm_platform_win32" = x"yes"])
+
 dnl ********************************
 dnl *** Check for basic programs ***
 dnl ********************************
diff --git a/thunar-vfs/thunar-vfs-mime-cache.c b/thunar-vfs/thunar-vfs-mime-cache.c
index 84665cc3d9fd1ab561785c7818bdad5e54d7e239..fb937498d5df9ccbe1bb0a573d24676d8e8998e5 100644
--- a/thunar-vfs/thunar-vfs-mime-cache.c
+++ b/thunar-vfs/thunar-vfs-mime-cache.c
@@ -163,9 +163,9 @@ thunar_vfs_mime_cache_class_init (ThunarVfsMimeCacheClass *klass)
 static void
 thunar_vfs_mime_cache_finalize (GObject *object)
 {
+#ifdef HAVE_MMAP
   ThunarVfsMimeCache *cache = THUNAR_VFS_MIME_CACHE (object);
 
-#ifdef HAVE_MMAP
   if (G_LIKELY (cache->buffer != NULL))
     munmap (cache->buffer, cache->bufsize);
 #endif
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 0f453687a6da39f046835bd24ef572fcebe0fd56..70e48360bcd3d578730d30f4a5ee587c277cbcc5 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -224,10 +224,12 @@ Thunar_LDADD +=								\
 	$(DBUS_LIBS)
 endif
 
+if !PLATFORM_WIN32
 # install symlink to 'thunar'
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	( cd $(DESTDIR)$(bindir) ; ln -sf Thunar thunar )
+endif
 
 clean-local:
 	rm -f *.core core core.*