diff --git a/ChangeLog b/ChangeLog
index 57a18649e..350ab8eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-06 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSWorkspace.m
+	* Images/GNUMakefile
+	Add Application folder (patch by Bertrand Dekoninck)
+	
 2016-03-22 Riccardo Mottola <rm@gnu.org>
 
 	* Headers/AppKit/NSWorkspace.h
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index 137f8e29a..91bc9ad7b 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -49,6 +49,7 @@ Images_RESOURCE_FILES = \
  common_3DArrowRight.tiff \
  common_3DArrowRightH.tiff \
  common_3DArrowUp.tiff \
+ common_ApplicationFolder.tiff \
  common_ArrowDown.tiff \
  common_ArrowDownH.tiff \
  common_ArrowLeft.tiff \
diff --git a/Images/common_ApplicationFolder.tiff b/Images/common_ApplicationFolder.tiff
new file mode 100644
index 000000000..f61da8f50
Binary files /dev/null and b/Images/common_ApplicationFolder.tiff differ
diff --git a/Source/NSWorkspace.m b/Source/NSWorkspace.m
index aae8e6a8e..4a2ba55be 100644
--- a/Source/NSWorkspace.m
+++ b/Source/NSWorkspace.m
@@ -671,6 +671,7 @@ static NSDictionary		*urlPreferences = nil;
   NSArray *documentDir;
   NSArray *libraryDirs;
   NSArray *sysAppDir;
+  NSArray *appDirs;
   NSArray *downloadDir;
   NSArray *desktopDir;
   NSArray *imgDir;
@@ -726,6 +727,8 @@ static NSDictionary		*urlPreferences = nil;
     NSAllDomainsMask, YES);
   sysAppDir = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory,
     NSSystemDomainMask, YES);
+  appDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory,
+    NSAllDomainsMask, YES);
   imgDir = NSSearchPathForDirectoriesInDomains(NSPicturesDirectory,
     NSUserDomainMask, YES);
   musicDir = NSSearchPathForDirectoriesInDomains(NSMusicDirectory,
@@ -756,6 +759,11 @@ static NSDictionary		*urlPreferences = nil;
       [folderPathIconDict setObject: @"LibraryFolder"
 	forKey: [libraryDirs objectAtIndex: i]];
     }
+  for (i = 0; i < [appDirs count]; i++)
+    {
+      [folderPathIconDict setObject: @"ApplicationFolder"
+	forKey: [appDirs objectAtIndex: i]];
+    }
   for (i = 0; i < [documentDir count]; i++)
     {
       [folderPathIconDict setObject: @"DocsFolder"