diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 920778116e850657db57fa126cbbf311b2c41d5f..717957faf5082ff93dd6e6282ea82b77d4176652 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -277,11 +277,23 @@ Foam::fileNameList Foam::findEtcFiles
 {
     fileNameList results;
 
+    // Search for user files in ./system
+    // Assumes the application is executed in the case directory
+    fileName searchDir = "system";
+    if (isDir(searchDir))
+    {
+        fileName fullName = searchDir/name;
+        if (isFile(fullName))
+        {
+            results.append(fullName);
+        }
+    }
+
     // Search for user files in
     // * ~/.OpenFOAM/VERSION
     // * ~/.OpenFOAM
     //
-    fileName searchDir = home()/".OpenFOAM";
+    searchDir = home()/".OpenFOAM";
     if (isDir(searchDir))
     {
         fileName fullName = searchDir/FOAMversion/name;
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index 479c56db0e8787e583b92c80e865086921ea043d..19b579a4601a8ce03aa2c5cb489b941308da64ba 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -364,7 +364,4 @@ Foam::simpleObjectRegistry& Foam::debug::dimensionedConstantObjects()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-
 // ************************************************************************* //