3 files changed, 6 insertions, 2 deletions

diff --git a/README b/README
index a5a92a9d7..7ebd4933b 100644
--- a/README
+++ b/README
@@ -138,6 +138,8 @@ emacsomancer (https://github.com/emacsomancer)
         - added profile for Conkeror browser
 eventyrer (https://github.com/eventyrer)
         - update gnome-mplayer.profile
+Fabian Würfl (https://github.com/BafDyce)
+        - fixed race condition when creating a new directory
 Felipe Barriga Richards (https://github.com/fbarriga)
         - --private-etc fix
 Franco (nextime) Lanza (https://github.com/nextime)
diff --git a/etc/geary.profile b/etc/geary.profile
index 1b702c83c..f655f0efe 100644
--- a/etc/geary.profile
+++ b/etc/geary.profile
@@ -3,7 +3,7 @@ include /etc/firejail/globals.local
 
 # This file is overwritten during software install.
 # Persistent customizations should go in a .local file.
-include /etc/firejail/geray.local
+include /etc/firejail/geary.local
 
 # Firejail profile for Gnome Geary
 # Users have Geary set to open a browser by clicking a link in an email
diff --git a/src/firejail/util.c b/src/firejail/util.c
index acbc19234..9ad7271ba 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -821,7 +821,9 @@ void create_empty_dir_as_root(const char *dir, mode_t mode) {
                 if (arg_debug)
                         printf("Creating empty %s directory\n", dir);
                 /* coverity[toctou] */
-                if (mkdir(dir, mode) == -1)
+                // don't fail if directory already exists. This can be the case in a race
+                // condition, when two jails launch at the same time. See #1013
+                if (mkdir(dir, mode) == -1 && errno != EEXIST)
                         errExit("mkdir");
                 if (set_perms(dir, 0, 0, mode))
                         errExit("set_perms");