diff --git a/defaults/main.yml b/defaults/main.yml
index b945f0c..61eb7c9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,6 +14,12 @@ dn42_roa_v6_location: "/etc/bird/roa_dn42_v6.conf"
 
 dn42_roa_cronjob: "curl -sfSLR -o{{ dn42_roa_v4_location }} -z{{ dn42_roa_v4_location }} {{ dn42_roa_v4_source }} && curl -sfSLR -o{{ dn42_roa_v6_location }} -z{{ dn42_roa_v6_location }} {{ dn42_roa_v6_source }} && birdc configure"
 
+dn42_pingfinder_enable: no
+dn42_pingfinder_download_url: "https://git.dn42.us/dn42/pingfinder/raw/master/clients/generic-linux-debian-redhat-busybox.sh"
+dn42_pingfinder_location: "/usr/bin/dn42_pingfinder"
+dn42_pingfinder_uuid: ""
+dn42_pingfinder_logfile: "/dev/null"
+
 dn42_peers:
   - name: "neighbour"
     as: "4242424242"
diff --git a/tasks/main.yml b/tasks/main.yml
index ef8bdfe..0daca3d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,6 +6,10 @@
   loop_control:
     loop_var: "peer"
 
+- name: Deploy Pingfinder
+  include_tasks: pingfinder.yml
+  when: dn42_pingfinder_enable
+
 - name: Download ROA-Tables
   shell: "{{ dn42_roa_cronjob }}"
   args:
diff --git a/tasks/pingfinder.yml b/tasks/pingfinder.yml
new file mode 100644
index 0000000..5044384
--- /dev/null
+++ b/tasks/pingfinder.yml
@@ -0,0 +1,13 @@
+---
+- name: Download Pingfinder Script
+  get_url:
+    url: "{{ dn42_pingfinder_download_url }}"
+    dest: "{{ dn42_pingfinder_location }}"
+    owner: "root"
+    group: "root"
+    mode: "0755"
+
+- name: Add Pingfinder Cronjob
+  cron:
+    job: "UUID={{ dn42_pingfinder_uuid }} LOGFILE:{{ dn42_pingfinder_logfile }} {{ dn42_pingfinder_location }}"
+    minute: "*/5"