diff --git a/src/Faker/Provider/hy_AM/Color.php b/src/Faker/Provider/hy_AM/Color.php
new file mode 100644
index 0000000000..16b68d8b2b
--- /dev/null
+++ b/src/Faker/Provider/hy_AM/Color.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Faker\Provider\hy_AM;
+
+class Color extends \Faker\Provider\Color
+{
+    protected static $safeColorNames = array(
+        'սև', 'դեղին', 'սպիտակ', 'մոխրագույն', 'կարմիր',
+        'կապույտ', 'երկնագույն', 'կանաչ', 'կապտականաչ',
+        'մանուշակագույն', 'շագանակագույն',
+    );
+}
diff --git a/src/Faker/Provider/hy_AM/Internet.php b/src/Faker/Provider/hy_AM/Internet.php
index 88e89ab969..e4ae2a0ed6 100644
--- a/src/Faker/Provider/hy_AM/Internet.php
+++ b/src/Faker/Provider/hy_AM/Internet.php
@@ -4,5 +4,6 @@
 
 class Internet extends \Faker\Provider\Internet
 {
+    protected static $freeEmailDomain = array('gmail.com', 'yahoo.com', 'hotmail.com', 'yandex.ru', 'mail.ru', 'mail.am');
     protected static $tld = array('com', 'com', 'am', 'am', 'am', 'net', 'org', 'ru', 'am', 'am', 'am');
 }
diff --git a/src/Faker/Provider/hy_AM/PhoneNumber.php b/src/Faker/Provider/hy_AM/PhoneNumber.php
index 04278fa9c5..aae914836d 100644
--- a/src/Faker/Provider/hy_AM/PhoneNumber.php
+++ b/src/Faker/Provider/hy_AM/PhoneNumber.php
@@ -4,34 +4,37 @@
 
 class PhoneNumber extends \Faker\Provider\PhoneNumber
 {
+
+    protected static $codes = array(91, 96, 99, 43, 77, 93, 94, 98, 97, 77, 55, 95, 41, 49);
+
+    protected static $numberFormats = array(
+        '######',
+        '##-##-##',
+        '###-###',
+    );
+
     protected static $formats = array(
-        '093 ######',
-        '093 ##-##-##',
-        '(093) ######',
-        '(093) ##-##-##',
-        '094 ######',
-        '094 ##-##-##',
-        '(094) ######',
-        '(094) ##-##-##',
-        '095 ######',
-        '095 ##-##-##',
-        '(095) ######',
-        '(095) ##-##-##',
-        '096 ######',
-        '096 ##-##-##',
-        '(096) ######',
-        '(096) ##-##-##',
-        '099 ######',
-        '099 ##-##-##',
-        '(099) ######',
-        '(099) ##-##-##',
-        '077 ######',
-        '077 ##-##-##',
-        '(077) ######',
-        '(077) ##-##-##',
-        '055 ######',
-        '055 ##-##-##',
-        '(055) ######',
-        '(055) ##-##-##',
+        '0{{code}} {{numberFormat}}',
+        '(0{{code}}) {{numberFormat}}',
+        '+374{{code}} {{numberFormat}}',
+        '+374 {{code}} {{numberFormat}}',
     );
+
+    public function phoneNumber()
+    {
+        return static::numerify($this->generator->parse(static::randomElement(static::$formats)));
+    }
+
+    public function code()
+    {
+        return static::randomElement(static::$codes);
+    }
+
+    /**
+     * @return mixed
+     */
+    public function numberFormat()
+    {
+        return static::randomElement(static::$numberFormats);
+    }
 }