diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
index 3d85e0d8ff..76f1a960f2 100644
--- a/Tests/Parser/fixtures/oss.yml
+++ b/Tests/Parser/fixtures/oss.yml
@@ -4190,3 +4190,43 @@
     version: "14.6"
     platform:
     family: iOS
+-
+  user_agent: WhatsApp/2.22.9.78 A
+  os:
+    name: Android
+    short_name: AND
+    version: ""
+    platform: ""
+    family: Android
+-
+  user_agent: GBWhatsApp/2.22.10.73 A
+  os:
+    name: Android
+    short_name: AND
+    version: ""
+    platform: ""
+    family: Android
+-
+  user_agent: WhatsApp/2.22.9.76 i
+  os:
+    name: iOS
+    short_name: IOS
+    version: ""
+    platform: ""
+    family: iOS
+-
+  user_agent: WhatsApp/2.2349.2 W
+  os:
+    name: Windows
+    short_name: WIN
+    version: ""
+    platform: ""
+    family: Windows
+-
+  user_agent: WhatsApp/2.2214.12 N
+  os:
+    name: Mac
+    short_name: MAC
+    version: ""
+    platform: ""
+    family: Mac
diff --git a/regexes/oss.yml b/regexes/oss.yml
index ff9ebb2be1..7245b33246 100644
--- a/regexes/oss.yml
+++ b/regexes/oss.yml
@@ -459,7 +459,7 @@
   name: 'Android'
   version: '$1'
 
-- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest'
+- regex: 'BeyondPod|AntennaPod|Podkicker|DoggCatcher|Player FM|okhttp|Podcatcher Deluxe|Sonos/.+\(ACR_|Linux x86_64; Quest|.*WhatsApp/.*A$'
   name: 'Android'
   version: ''
 
@@ -723,7 +723,7 @@
   name: 'Windows'
   version: '$1'
 
-- regex: 'mingw32|winhttp'
+- regex: 'mingw32|winhttp|WhatsApp/.*W$'
   name: 'Windows'
   version: ''
 
@@ -1085,7 +1085,7 @@
   name: 'iOS'
   version: '$1'
 
-- regex: '(?:Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|\(iOS\)|iOS; Opera|Overcast|Castro|Podcat|iCatcher|RSSRadio/|MobileSafari/)(?!.*x86_64)'
+- regex: '(?:Podcasts/(?:[\d\.]+)|Instacast(?:HD)?/(?:\d\.[\d\.abc]+)|Pocket Casts, iOS|\(iOS\)|iOS; Opera|Overcast|Castro|Podcat|iCatcher|RSSRadio/|MobileSafari/|WhatsApp/.*i$)(?!.*x86_64)'
   name: 'iOS'
   version: ''
 
@@ -1306,7 +1306,7 @@
   name: 'Mac'
   version: '$1'
 
-- regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC|iMac|MacBook|macOS|AppleExchangeWebServices|com.apple.trustd|Sonos/.+\(MDCR_'
+- regex: 'Darwin|Macintosh|Mac[ _]PowerPC|PPC|iMac|MacBook|macOS|AppleExchangeWebServices|com.apple.trustd|Sonos/.+\(MDCR_|WhatsApp/.*N$'
   name: 'Mac'
   version: ''