diff --git a/contrib/lang/html/config.el b/contrib/lang/html/config.el
index 14b76db4b..abdf3a931 100644
--- a/contrib/lang/html/config.el
+++ b/contrib/lang/html/config.el
@@ -13,3 +13,5 @@
 ;; Variables
 
 (spacemacs|defvar-company-backends css-mode)
+(spacemacs|defvar-company-backends web-mode)
+
diff --git a/contrib/lang/html/packages.el b/contrib/lang/html/packages.el
index eed7bd5b4..fd32399f2 100644
--- a/contrib/lang/html/packages.el
+++ b/contrib/lang/html/packages.el
@@ -13,6 +13,7 @@
 (setq html-packages
   '(
     company
+    company-web
     css-mode
     emmet-mode
     evil-matchit
@@ -28,6 +29,9 @@
     slim-mode
     ))
 
+(defun html/init-company-web ()
+  (use-package company-web))
+
 (defun html/init-css-mode ()
   (use-package css-mode
     :defer t
@@ -44,6 +48,8 @@
 (defun html/init-web-mode ()
   (use-package web-mode
     :defer t
+    :init
+    (push 'company-web-html company-backends-web-mode)
     :config
     (progn
       ;; Only use smartparens in web-mode
@@ -183,4 +189,5 @@
 
 (when (configuration-layer/layer-usedp 'auto-completion)
   (defun html/post-init-company ()
-    (spacemacs|add-company-hook css-mode)))
+    (spacemacs|add-company-hook css-mode)
+    (spacemacs|add-company-hook web-mode)))