diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h
index f60b2bb78c..c198f270c2 100644
--- a/extras/Introjucer/Source/Application/jucer_Application.h
+++ b/extras/Introjucer/Source/Application/jucer_Application.h
@@ -537,7 +537,11 @@ public:
     virtual void doExtraInitialisation() {}
     virtual void addExtraConfigItems (Project&, TreeViewItem&) {}
 
+   #if JUCE_LINUX
+    virtual String getLogFolderName() const    { return "~/.config/Introjucer/Logs"; }
+   #else
     virtual String getLogFolderName() const    { return "com.juce.introjucer"; }
+   #endif
 
     virtual PropertiesFile::Options getPropertyFileOptionsFor (const String& filename)
     {
@@ -546,7 +550,7 @@ public:
         options.filenameSuffix      = "settings";
         options.osxLibrarySubFolder = "Application Support";
        #if JUCE_LINUX
-        options.folderName          = ".introjucer";
+        options.folderName          = "~/.config/Introjucer";
        #else
         options.folderName          = "Introjucer";
        #endif
diff --git a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
index 6d91f7dfd7..3e9f8f13fa 100644
--- a/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
+++ b/modules/juce_data_structures/app_properties/juce_PropertiesFile.cpp
@@ -82,9 +82,9 @@ File PropertiesFile::Options::getDefaultFile() const
         dir = dir.getChildFile (folderName);
 
    #elif JUCE_LINUX || JUCE_ANDROID
-    const File dir ((commonToAllUsers ? "/var/" : "~/")
-                        + (folderName.isNotEmpty() ? folderName
-                                                   : ("." + applicationName)));
+    const File dir (File (commonToAllUsers ? "/var" : "~")
+                     .getChildFile (folderName.isNotEmpty() ? folderName
+                                                            : ("." + applicationName)));
 
    #elif JUCE_WINDOWS
     File dir (File::getSpecialLocation (commonToAllUsers ? File::commonApplicationDataDirectory