2 files changed, 18 insertions, 9 deletions

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 751347b29..c7c8fd9fa 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1367,7 +1367,7 @@ void profile_read(const char *fname) {
                 if (ptr && strlen(ptr) == 6)
                         return;
 
-                fprintf(stderr, "Error: cannot access profile file\n");
+                fprintf(stderr, "Error: cannot access profile file: %s\n", fname);
                 exit(1);
         }
 
@@ -1429,17 +1429,22 @@ void profile_read(const char *fname) {
                 if (strncmp(ptr, "include ", 8) == 0) {
                         include_level++;
 
-                        // extract profile filename and new skip params
-                        char *newprofile = ptr + 8; // profile name
+                        // expand macros in front of the include profile file
+                        char *newprofile = expand_macros(ptr + 8);
 
-                        // expand ${HOME}/ in front of the new profile file
-                        char *newprofile2 = expand_macros(newprofile);
+                        char *ptr2 = newprofile;
+                        while (*ptr2 != '/' && *ptr2 != '\0')
+                                ptr2++;
+                        // profile path contains no / chars, do a search
+                        if (*ptr2 == '\0') {
+                                profile_find_firejail(newprofile, 0);
+                        }
+                        else {
+                                profile_read(newprofile);
+                        }
 
-                        // recursivity
-                        profile_read((newprofile2)? newprofile2:newprofile);
                         include_level--;
-                        if (newprofile2)
-                                free(newprofile2);
+                        free(newprofile);
                         free(ptr);
                         continue;
                 }
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index ca7b52a51..17423cac1 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -113,6 +113,10 @@ Example: "include ${HOME}/myprofiles/profile1" will load "~/myprofiles/profile1"
 
 Example: "include ${CFG}/firefox.profile" will load "/etc/firejail/firefox.profile" file.
 
+The file name may also be just the name without the leading directory components.  In this case, first the user config directory (${HOME}/.config/firejail) is searched for the file name and if not found then the system configuration directory is search for the file name.  Note: Unlike the \-\-profile option which takes a profile name without the '.profile' suffix, include must be given the full file name.
+
+Example: "include firefox.profile" will load "${HOME}/.config/firejail/firefox.profile" file and if it does not exist "${CFG}/firefox.profile" will be loaded.
+
 System configuration files in ${CFG} are overwritten during software installation.
 Persistent configuration at system level is handled in ".local" files. For every
 profile file in ${CFG} directory, the user can create a corresponding .local file