diff --git a/.htaccess b/.htaccess
index 4076143b90..a9af2edf5b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,10 +1,25 @@
-RewriteEngine	On
+ewriteEngine	On
 
-RewriteRule     ^([A-Fa-f0-9]{12})(\.(xml|cfg))?$                        app/provision/index.php?mac=$1 [QSA]
-RewriteRule     ^([A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-])(\.(xml|cfg))?$                        app/provision/index.php?mac=$1 [QSA]
-RewriteRule     ^(kt.*?-)([A-Fa-f0-9]{12})(\.(xml))$                        app/provision/index.php?mac=$2 [QSA]
-RewriteRule     ^(cfg)([A-Fa-f0-9]{12})(\.(xml))$                        app/provision/index.php?mac=$2 [QSA]
+RewriteRule     ^([A-Fa-f0-9]{12})(\.(xml|cfg))?$                      app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^([A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-][A-Fa-f0-9]{2}[:-])(\.(xml|cfg))?$     app/provision/index.php?mac=$1 [QSA]
+RewriteRule     ^(kt.*?-)([A-Fa-f0-9]{12})(\.(xml))$                   app/provision/index.php?mac=$2 [QSA]
+RewriteRule     ^(cfg)([A-Fa-f0-9]{12})(\.(xml))$                      app/provision/index.php?mac=$2 [QSA]
 
-#snom m3
-RewriteRule     ^(m3/settings/)([A-Fa-f0-9]{12})(\.(cfg))?$                        app/provision/index.php?mac=$2 [QSA]
+#Snom m3
+RewriteRule     ^(m3/settings/)([A-Fa-f0-9]{12})(\.(cfg))?$            app/provision/index.php?mac=$2 [QSA]
+
+#Grandstream
+RewriteRule     ^.*/provision/cfg([A-Fa-f0-9]{12})(\.(xml|cfg))?$      app/provision/?mac=$1;
+
+#Yealink
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})(\.(xml|cfg))?$         app/provision/index.php?mac=$1 last;
+
+#Polycom
+RewriteRule     ^.*/provision/000000000000.cfg$                       app/provison/?mac=$1&file=%7b%24mac%7d.cfg" [QSA]
+RewriteRule     ^.*/provision/features.cfg$                           app/provision/?mac=$1&file=features.cfg [QSA]
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})-sip.cfg$              app/provision/?mac=$1&file=sip.cfg [QSA]
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})-phone.cfg$            app/provision/?mac=$1 [QSA]
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})-registration.cfg$     app/provision/?mac=$1&file=%7b%24mac%7d-registration.cfg [QSA]
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})-site.cfg$             app/provision/?mac=$1&file=site.cfg [QSA]
+RewriteRule     ^.*/provision/([A-Fa-f0-9]{12})-web.cfg$              app/provision/?mac=$1&file=web.cfg [QSA]