diff --git a/CHANGELOG b/CHANGELOG
index 0acbfc911b..d1be66deaa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Sanitize path in file_open against suffix (CVE-2017-0360)
 * Add constraint on user password
 * Remove Property field
 * Add MultiValueMixin and ValueMixin
diff --git a/trytond/tests/test_tools.py b/trytond/tests/test_tools.py
index e6ca029cef..4271c0b624 100644
--- a/trytond/tests/test_tools.py
+++ b/trytond/tests/test_tools.py
@@ -134,6 +134,11 @@ class ToolsTestCase(unittest.TestCase):
         with self.assertRaisesRegexp(IOError, "Permission denied:"):
             file_open('../../foo')
 
+    def test_file_open_suffix(self):
+        "Test file_open from same root name but with a suffix"
+        with self.assertRaisesRegexp(IOError, "Permission denied:"):
+            file_open('../trytond_suffix', subdir=None)
+
 
 def suite():
     func = unittest.TestLoader().loadTestsFromTestCase
diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py
index 2b9a7f8f43..ec53fe3848 100644
--- a/trytond/tools/misc.py
+++ b/trytond/tools/misc.py
@@ -32,7 +32,7 @@ def file_open(name, mode="r", subdir='modules', encoding=None):
         "Join paths and ensure it still below root"
         path = os.path.join(root, *paths)
         path = os.path.normpath(path)
-        if not path.startswith(root):
+        if not path.startswith(os.path.join(root, '')):
             raise IOError("Permission denied: %s" % name)
         return path