diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 81f87bd60..cbc04fdeb 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -45,8 +45,8 @@ CheckMemoryLeakNoVar instance4;
 // This list needs to be alphabetically sorted so we can run bsearch on it
 static const char * const call_func_white_list[] =
 {
-    "access", "asctime", "asctime_r", "asprintf", "assert", "atof", "atoi", "atol", "clearerr"
-    , "ctime", "ctime_r", "delete", "fchmod", "fclose", "fcntl"
+    "access", "asctime", "asctime_r", "asprintf", "assert", "atof", "atoi", "atol", "chdir", "chmod", "chown"
+    , "clearerr", "ctime", "ctime_r", "delete", "fchmod", "fclose", "fcntl"
     , "fdatasync", "feof", "ferror", "fflush", "fgetc", "fgetpos", "fgets"
     , "flock", "for", "fprintf", "fputc", "fputs", "fread", "free", "fscanf", "fseek"
     , "fseeko", "fsetpos", "fstat", "fsync", "ftell", "ftello", "ftruncate"
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
index 85b61c638..8202ced06 100644
--- a/test/testmemleak.cpp
+++ b/test/testmemleak.cpp
@@ -565,8 +565,8 @@ private:
 
         static const char * const call_func_white_list[] =
         {
-            "access", "asprintf", "atof", "atoi", "atol", "clearerr", "delete", "fchmod", "fcntl"
-            , "fdatasync", "feof", "ferror", "fflush", "fgetc", "fgetpos", "fgets"
+            "access", "asprintf", "atof", "atoi", "atol", "chdir", "chmod", "clearerr", "chown", "delete"
+            , "fchmod", "fcntl", "fdatasync", "feof", "ferror", "fflush", "fgetc", "fgetpos", "fgets"
             , "flock", "for", "fprintf", "fputc", "fputs", "fread", "free", "fscanf", "fseek"
             , "fseeko", "fsetpos", "fstat", "fsync", "ftell", "ftello", "ftruncate"
             , "fwrite", "getc", "if", "ioctl", "lockf", "lseek", "memchr", "memcpy"
@@ -1869,6 +1869,140 @@ private:
               "    return;\n"
               "}\n");
         ASSERT_EQUALS("", errout.str());
+
+
+        // checking for chdir function
+        // http://home.fhtw-berlin.de/~junghans/cref/MAN/chdir.htm
+        // --------------------------------------------------------
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chdir (cpDir) != 0)\n"
+              "    {\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chdir (cpDir) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:10]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chdir (cpDir) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+        // checking for chmod function
+        // http://publib.boulder.ibm.com/infocenter/zos/v1r10/index.jsp?topic=/com.ibm.zos.r10.bpxbd00/rtchm.htm
+        // ------------------------------------------------------------------------------------------------------
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chmod(cpDir, S_IRWXU|S_IRWXG) != 0)\n"
+              "    {\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chmod(cpDir, S_IRWXU|S_IRWXG) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:10]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chmod(cpDir, S_IRWXU|S_IRWXG) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+
+
+        // checking for chown function
+        // http://publib.boulder.ibm.com/infocenter/zos/v1r10/index.jsp?topic=/com.ibm.zos.r10.bpxbd00/rtchm.htm
+        // ------------------------------------------------------------------------------------------------------
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chown(cpDir, 25, 0) != 0)\n"
+              "    {\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:7]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chown(cpDir, 25, 0) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("[test.cpp:10]: (error) Memory leak: cpDir\n", errout.str());
+
+        check("void foo()\n"
+              "{\n"
+              "    char * cpDir = new char [7];\n"
+              "    strcpy (cpDir, \"/home/\");\n"
+              "    if (chown(cpDir, 25, 0) != 0)\n"
+              "    {\n"
+              "        delete [] cpDir;\n"
+              "        return;\n"
+              "    }\n"
+              "    delete [] cpDir;\n"
+              "    return;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void allocfunc1()