diff --git a/group_vars/all b/group_vars/all
index 7271cba..e774a47 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -97,6 +97,7 @@ gitannex:
 
 bitlbee:
     run_on: trusted
+    torify: True
 
 bootloader: grub
 
diff --git a/roles/bitlbee/files/bitlbee.conf b/roles/bitlbee/files/bitlbee.conf
deleted file mode 100644
index ef1fe51..0000000
--- a/roles/bitlbee/files/bitlbee.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[settings]
-RunMode = ForkDaemon
-User = bitlbee
-
-[defaults]
-private = 1
diff --git a/roles/bitlbee/meta/main.yml b/roles/bitlbee/meta/main.yml
index 4b8bb65..d5970b2 100644
--- a/roles/bitlbee/meta/main.yml
+++ b/roles/bitlbee/meta/main.yml
@@ -3,3 +3,4 @@ dependencies:
   - { role: networkmanager }
   - { role: firejail }
   - { role: systemd }
+  - { role: tor }
diff --git a/roles/bitlbee/tasks/main.yml b/roles/bitlbee/tasks/main.yml
index 74a69c3..bde932b 100644
--- a/roles/bitlbee/tasks/main.yml
+++ b/roles/bitlbee/tasks/main.yml
@@ -5,8 +5,8 @@
 - name: Install Bitlbee
   pacman: name=bitlbee state=present
 
-- name: Copy Bitlbee configuration file
-  copy: src=bitlbee.conf dest=/etc/bitlbee/bitlbee.conf
+- name: Push Bitlbee configuration file
+  template: src=bitlbee.conf.j2 dest=/etc/bitlbee/bitlbee.conf
 
 - name: Ensure proper ownership of configuration directory
   file: path=/var/lib/bitlbee group=bitlbee owner=bitlbee
diff --git a/roles/bitlbee/templates/bitlbee.conf.j2 b/roles/bitlbee/templates/bitlbee.conf.j2
new file mode 100644
index 0000000..39df0a4
--- /dev/null
+++ b/roles/bitlbee/templates/bitlbee.conf.j2
@@ -0,0 +1,9 @@
+[settings]
+RunMode = ForkDaemon
+User = bitlbee
+{% if tor and bitlbee.torify %}
+Proxy = socks5://localhost:9050
+{% endif %}
+
+[defaults]
+private = 1