diff --git a/ChangeLog b/ChangeLog
index 18a2cda3f65fbb4c2b9907a1d327d5d21d53b2da..e75891c9df70b8bc922de473060e518623e8c06f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-12  Jannis Pohlmann <jannis@xfce.org>
+
+	* thunar-vfs/thunar-vfs-io-jobs.c: Apply umask properly when
+	  creating files/directories. Patch by Giovanni Bechis (bug 
+	  #3532).
+
 2009-02-24  Stephan Arts <stephan@xfce.org>
 
 	* == Released 1.0.0 ==
diff --git a/thunar-vfs/thunar-vfs-io-jobs.c b/thunar-vfs/thunar-vfs-io-jobs.c
index d093120bf9ed6ef2b3b0fb8e389d1f0745681f64..8d70812ada5707f389be665a904161420a590c77 100644
--- a/thunar-vfs/thunar-vfs-io-jobs.c
+++ b/thunar-vfs/thunar-vfs-io-jobs.c
@@ -433,7 +433,7 @@ _thunar_vfs_io_jobs_create (ThunarVfsJob *job,
 
 again:
       /* try to create the file at the given path */
-      fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, 0644);
+      fd = g_open (absolute_path, O_CREAT | O_EXCL | O_WRONLY, DEFFILEMODE);
       if (G_UNLIKELY (fd < 0))
         {
           /* check if the file already exists */
@@ -708,7 +708,7 @@ _thunar_vfs_io_jobs_mkdir (ThunarVfsJob *job,
       _thunar_vfs_job_process_path (job, lp);
 
       /* try to create the target directory */
-      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0755, THUNAR_VFS_IO_OPS_NONE, error))
+      if (!_thunar_vfs_io_ops_mkdir (lp->data, 0777 & ~umask(0), THUNAR_VFS_IO_OPS_NONE, error))
         return FALSE;
     }