diff --git a/lib/Doctrine/Common/Inflector/Inflector.php b/lib/Doctrine/Common/Inflector/Inflector.php
index f9067a02..35b5c68b 100644
--- a/lib/Doctrine/Common/Inflector/Inflector.php
+++ b/lib/Doctrine/Common/Inflector/Inflector.php
@@ -85,6 +85,7 @@ class Inflector
             'beef' => 'beefs',
             'brother' => 'brothers',
             'cafe' => 'cafes',
+            'canvas' => 'canvases',
             'chateau' => 'chateaux',
             'niveau' => 'niveaux',
             'child' => 'children',
@@ -99,6 +100,7 @@ class Inflector
             'foot' => 'feet',
             'fungus' => 'fungi',
             'ganglion' => 'ganglions',
+            'gas' => 'gases',
             'genie' => 'genies',
             'genus' => 'genera',
             'goose' => 'geese',
diff --git a/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php b/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php
index 3db1d3a4..24b163de 100644
--- a/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php
+++ b/tests/Doctrine/Tests/Common/Inflector/InflectorTest.php
@@ -39,6 +39,7 @@ public function dataSampleWords() : array
             array('cactus', 'cacti'),
             array('cafe', 'cafes'),
             array('calf', 'calves'),
+            array('canvas', 'canvases'),
             array('categoria', 'categorias'),
             array('chateau', 'chateaux'),
             array('cherry', 'cherries'),
@@ -73,6 +74,7 @@ public function dataSampleWords() : array
             array('FoodMenu', 'FoodMenus'),
             array('foot', 'feet'),
             array('fungus', 'fungi'),
+            array('gas', 'gases'),
             array('goose', 'geese'),
             array('glove', 'gloves'),
             array('gulf', 'gulfs'),