diff --git a/README.md b/README.md
index 1de615d..84b18eb 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,12 @@ Spark is an [Ansible][1] playbook meant to provision a personal machine running
 taking the place of any [post-installation][3]), but due to Ansible's
 idempotent nature it may also be run on top of an already configured machine.
 
-Spark assumes it will be run on a laptop -- specifically, a ThinkPad -- and
-performs some configuration based on this assumption. This behaviour may be
-changed by removing the `laptop` and/or `thinkpad` role from the playbook, as
-appropriate.
+Spark assumes it will be run on a laptop and performs some configuration based
+on this assumption. This behaviour may be changed by removing the `laptop` role
+from the playbook or by skipping the `laptop` tag.
+
+If Spark is run on either a ThinkPad or a MacBook, it will detect this and
+execute platform-specific tasks.
 
 ## Running
 
diff --git a/playbook.yml b/playbook.yml
index c09aa7f..24dfed9 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -14,7 +14,8 @@
     - { role: browsers, tags: ['browsers'] }
     - { role: media, tags: ['media'] }
     - { role: laptop, tags: ['laptop'] }
-    - { role: thinkpad, tags: ['thinkpad'] }
+    - { role: thinkpad, tags: ['thinkpad'], when: "'ThinkPad' in ansible_product_version" }
+    - { role: macbook, tags: ['macbook'], when: "'MacBook' in ansible_product_name" }
     - { role: screensaver, tags: ['screensaver'] }
     - { role: chat, tags: ['chat'] }
     - { role: git-annex, tags: ['git-annex'] }