diff --git a/regexes.yaml b/regexes.yaml
index 21ca5c41..b42a09b3 100644
--- a/regexes.yaml
+++ b/regexes.yaml
@@ -538,6 +538,10 @@ user_agent_parsers:
   # Generic mirall client
   - regex: '(mirall)/(\d+)\.(\d+)\.(\d+)'
 
+  # Nextcloud/Owncloud android client
+  - regex: '(ownCloud-android)/(\d+)\.(\d+)\.(\d+)'
+    family_replacement: 'Owncloud'
+
   #### END MAIN CASES ####
 
   #### SPECIAL CASES ####
diff --git a/tests/test_device.yaml b/tests/test_device.yaml
index b93f7314..ffdfb529 100644
--- a/tests/test_device.yaml
+++ b/tests/test_device.yaml
@@ -79999,3 +79999,8 @@ test_cases:
     family: 'Gionee GN3003'
     brand: 'Gionee'
     model: 'GN3003'
+
+  - user_agent_string: 'Mozilla/5.0 (Android) ownCloud-android/2.0.0'
+    family: 'Generic Smartphone'
+    brand: 'Generic'
+    model: 'Smartphone'
diff --git a/tests/test_os.yaml b/tests/test_os.yaml
index e82aa9e7..0d427ee9 100644
--- a/tests/test_os.yaml
+++ b/tests/test_os.yaml
@@ -2425,3 +2425,10 @@ test_cases:
     minor:
     patch:
     patch_minor:
+
+  - user_agent_string: 'Mozilla/5.0 (Android) ownCloud-android/2.0.0'
+    family: 'Android'
+    major:
+    minor:
+    patch:
+    patch_minor:
diff --git a/tests/test_ua.yaml b/tests/test_ua.yaml
index b3fe2897..23d69d60 100644
--- a/tests/test_ua.yaml
+++ b/tests/test_ua.yaml
@@ -7329,3 +7329,9 @@ test_cases:
     major:
     minor:
     patch:
+
+  - user_agent_string: 'Mozilla/5.0 (Android) ownCloud-android/2.0.0'
+    family: 'Owncloud'
+    major: '2'
+    minor: '0'
+    patch: '0'