diff --git a/configure.ac b/configure.ac
index ba75b11..bb31cd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.69])
-AC_INIT([fuse-overlayfs], [0.4], [giuseppe@scrivano.org])
+AC_INIT([fuse-overlayfs], [0.4.1], [giuseppe@scrivano.org])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_HEADERS([config.h])
 
diff --git a/main.c b/main.c
index af972aa..4f36694 100644
--- a/main.c
+++ b/main.c
@@ -637,11 +637,26 @@ hide_node (struct ovl_data *lo, struct ovl_node *node, bool unlink_src)
         {
           if (node->parent)
             {
-              if (create_whiteout (lo, node->parent, node->name, false, false) < 0)
+              /* If we are here, it means we have no permissions to use mknod.  Also
+                 since the file is not yet moved, creating a whiteout would fail on
+                 the mknodat call.  */
+              if (create_whiteout (lo, node->parent, node->name, true, false) < 0)
                 return -1;
             }
           if (renameat (upper_layer_fd (lo), node->path, lo->workdir_fd, newpath) < 0)
-            return -1;
+            {
+              if (node->parent)
+                {
+                  cleanup_free char *whpath = NULL;
+
+                  ret = asprintf (&whpath, "%s/.wh.%s", node->parent->path, node->name);
+                  /* If the rename failed, then try to delete the whiteout file we
+                     created earlier.  */
+                  if (ret == 0)
+                    unlinkat (upper_layer_fd (lo), whpath, 0);
+                }
+              return -1;
+            }
         }
     }
   else
diff --git a/tests/fedora-installs.sh b/tests/fedora-installs.sh
index c73ab8c..50dd9ca 100755
--- a/tests/fedora-installs.sh
+++ b/tests/fedora-installs.sh
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
+
+set -xeuo pipefail
 
 mkdir lower upper workdir merged
 
 fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
 
-docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 29 install -y glibc-common gedit
+docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 30 install -y glibc-common gedit
 
 umount merged
 
@@ -16,8 +18,11 @@ mkdir upper workdir
 fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
 
 # Install some big packages
-docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 29 install -y emacs texlive
+docker run --rm -ti -v merged:/merged fedora dnf --installroot /merged --releasever 30 install -y emacs texlive
 
-docker run --rm -ti -v merged:/merged fedora sh -c 'rm /usr/share/glib-2.0/schemas/gschemas.compiled; glib-compile-schemas /usr/share/glib-2.0/schemas/'
+docker run --rm -ti -v merged:/merged fedora sh -c 'rm /merged/usr/share/glib-2.0/schemas/gschemas.compiled; glib-compile-schemas /merged/usr/share/glib-2.0/schemas/'
 
 umount merged
+fuse-overlayfs -o lowerdir=lower,upperdir=upper,workdir=workdir,suid,dev merged
+
+docker run --rm -ti -v merged:/merged fedora sh -c 'rm -rf /merged/usr/share/glib-2.0/'