diff --git a/regexes.yaml b/regexes.yaml
index 3beb6fbd..ae987402 100644
--- a/regexes.yaml
+++ b/regexes.yaml
@@ -383,8 +383,7 @@ user_agent_parsers:
 
   # Headless Chrome
   # https://chromium.googlesource.com/chromium/src/+/lkgr/headless/README.md
-  # Currently only available on Linux
-  - regex: 'HeadlessChrome'
+  - regex: '(HeadlessChrome)/(\d+)\.(\d+)(?:\.(\d+))?'
     family_replacement: 'HeadlessChrome'
 
   # Browser/major_version.minor_version
diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml
index f18bde62..c0e44e12 100644
--- a/tests/test_ua.yaml
+++ b/tests/test_ua.yaml
@@ -6657,11 +6657,17 @@ test_cases:
     minor: '7'
     patch: '10'
 
-  - user_agent_string: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome Safari/537.36'
+  - user_agent_string: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/60.0.3112.78 Safari/537.36'
     family: 'HeadlessChrome'
-    major:
-    minor:
-    patch:
+    major: '60'
+    minor: '0'
+    patch: '3112'
+
+  - user_agent_string: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/59.0.3071.109 HeadlessChrome/59.0.3071.109 Safari/537.36'
+    family: 'HeadlessChrome'
+    major: '59'
+    minor: '0'
+    patch: '3071'
 
   - user_agent_string: 'Roku/DVP-6.2 (096.02E06005A)'
     family: 'Roku'