diff --git a/README.rst b/README.rst
index 5468d6a4fb2dd1f6275d4e62b6395c4424b2bba8..aa915ecf11382d771adcd2bac56e1cc72b3c1227 100644
--- a/README.rst
+++ b/README.rst
@@ -63,6 +63,4 @@ at: https://www.shore.co.il/git/.
 TODO
 ----
 
-- Support for Ubuntu Xenial (better assertions as well).
-- Maybe detect Systemd version?
 - Tests.
diff --git a/meta/main.yml b/meta/main.yml
index 94478c2176f949b4a04a26ac82c77e80dadf17a7..dfd24ca764c459e09084b243dcce6a13828194d4 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -9,5 +9,8 @@ galaxy_info:
     versions:
     - Jessie
     - Stretch
+  - name: Ubuntu
+    versions:
+    - xenial
   galaxy_tags: [ ansible ]
 dependencies: []
diff --git a/tasks/main.yml b/tasks/main.yml
index 92f8866a10d63fff4cd570abeb62b83a2815221f..da3b546a577456377755a015cbb8222b0d6cc66f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -5,7 +5,7 @@
   assert:
     that:
         - ansible_os_family == 'Debian'
-        - ansible_distribution_major_version >= 8
+        - ansible_distribution_release in ['jessie', 'xenial'] or ansible_distribution_version in ['stretch/sid']
         - ansible_service_mgr == 'systemd'
 
 - name: APT install