diff --git a/SOURCES/rhel-system-roles-kdump-ssh.diff b/SOURCES/rhel-system-roles-kdump-ssh.diff
new file mode 100644
index 0000000..f40192b
--- /dev/null
+++ b/SOURCES/rhel-system-roles-kdump-ssh.diff
@@ -0,0 +1,104 @@
+diff --git a/defaults/main.yml b/defaults/main.yml
+index 15a741d..270408c 100644
+--- a/defaults/main.yml
++++ b/defaults/main.yml
+@@ -3,3 +3,6 @@ dump_target: null
+ path: /var/crash
+ core_collector: null
+ system_action: reboot
++ssh_dump_user: null
++ssh_dump_server: null
++sshkey: /root/.ssh/kdump_id_rsa
+diff --git a/tasks/main.yml b/tasks/main.yml
+index 2c95ced..427f83f 100644
+--- a/tasks/main.yml
++++ b/tasks/main.yml
+@@ -8,6 +8,11 @@
+   command: cat /sys/kernel/kexec_crash_size
+   register: kexec_crash_size
+ 
++- include_tasks: ssh.yml
++  when:
++    - dump_target
++    - dump_target.kind == "ssh"
++
+ - name: Generate /etc/kdump.conf
+   template:
+     src: kdump.conf.j2
+diff --git a/tasks/ssh.yml b/tasks/ssh.yml
+new file mode 100644
+index 0000000..2df84a8
+--- /dev/null
++++ b/tasks/ssh.yml
+@@ -0,0 +1,17 @@
++---
++- stat: path="{{ sshkey }}"
++  register: sshkey_stats
++
++- command: "/usr/bin/ssh-keygen -t rsa -f {{ sshkey }} -N '' "
++  when: sshkey_stats.stat.exists == False
++
++- name: cat file to register
++  shell: cat {{ sshkey }}.pub
++  register: keydata
++
++- name:
++  authorized_key:
++    user: "{{ ssh_dump_user }}"
++    key: "{{ keydata.stdout }}"
++    state: present
++  delegate_to: "{{ ssh_dump_server }}"
+diff --git a/templates/kdump.conf.j2 b/templates/kdump.conf.j2
+index 260e842..1b48ba3 100644
+--- a/templates/kdump.conf.j2
++++ b/templates/kdump.conf.j2
+@@ -4,6 +4,11 @@
+ {% if dump_target %}
+ {{ dump_target.kind }} {{ dump_target.location }}
+ {% endif %}
++
++{% if dump_target and dump_target.kind == "ssh" and sshkey != '/root/.ssh/kdump_id_rsa' %}
++sshkey {{ sshkey }}
++{% endif %}
++
+ path {{ path }}
+ {% if core_collector %}
+ core_collector {{ core_collector }}
+diff --git a/test/test_ssh.yml b/test/test_ssh.yml
+new file mode 100644
+index 0000000..af8b51e
+--- /dev/null
++++ b/test/test_ssh.yml
+@@ -0,0 +1,32 @@
++
++- name: Ensure that the rule runs with ssh
++  hosts: all
++  vars:
++    # this is the outside address under which the ssh dump server is
++    # known and ansible is supposed to be configured to be able to
++    # connect to it (via inventory).
++    ssh_dump_server_outside: localhost
++
++  tasks:
++    - name: gather facts from {{ ssh_dump_server_outside }}
++      setup:
++      delegate_to: "{{ ssh_dump_server_outside }}"
++      delegate_facts: True
++
++    - include_role:
++        name: kdump
++      vars:
++        ssh_dump_user: "{{ hostvars[ssh_dump_server_outside]['ansible_user_id'] }}"
++        # This is the outside address. Ansible will connect to it to
++        # copy the ssh key.
++        ssh_dump_server: "{{ ssh_dump_server_outside }}"
++        path: /tmp/test
++        dump_target:
++          kind: ssh
++          # This is the ssh dump server address visible from inside
++          # the machine being configured. Dumps are to be copied
++          # there. We make here the assumption that this machine is
++          # being run as a VM and the dump server is the VM host
++          # (i.e. for ansible this is localhost). From the VM its
++          # address is then identical to the default route.
++          location: "{{ ssh_dump_user }}@{{ ansible_default_ipv4.gateway }}"
diff --git a/SPECS/rhel-system-roles.spec b/SPECS/rhel-system-roles.spec
index 9701f96..6b7b791 100644
--- a/SPECS/rhel-system-roles.spec
+++ b/SPECS/rhel-system-roles.spec
@@ -1,7 +1,7 @@
 Name: rhel-system-roles
 Summary: Set of interfaces for unified system management
 Version: 0.5
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 #Group: Development/Libraries
 License: GPLv3+ and MIT and BSD
@@ -48,6 +48,8 @@ Patch2: rhel-system-roles-%{rolename2}-prefix.diff
 Patch3: rhel-system-roles-%{rolename3}-prefix.diff
 Patch5: rhel-system-roles-%{rolename5}-prefix.diff
 
+Patch101: rhel-system-roles-kdump-ssh.diff
+
 Url: https://github.com/linux-system-roles/
 BuildArch: noarch
 
@@ -61,6 +63,9 @@ using Ansible.
 
 %prep
 %setup -qc -b1 -b2 -b3 -b5
+cd %{rolename0}-%{version0}
+%patch101 -p1
+cd ..
 cd %{rolename1}-%{version1}
 %patch1 -p1
 cd ..
@@ -168,6 +173,12 @@ rmdir $RPM_BUILD_ROOT%{_datadir}/ansible/roles/%{rolecompatprefix}network/exampl
 %license %{_datadir}/ansible/roles/%{rolecompatprefix}network/COPYING
 
 %changelog
+* Tue Dec 19 2017 Pavel Cahyna <pcahyna@redhat.com> - 0.5-3
+- kdump: fix the wrong conditional for ssh checking and improve test (PR#10)
+
+* Tue Nov 07 2017 Pavel Cahyna <pcahyna@redhat.com> - 0.5-2
+- kdump: add ssh support. upstream PR#9, rhbz1478707
+
 * Tue Oct 03 2017 Pavel Cahyna <pcahyna@redhat.com> - 0.5-1
 - SELinux: fix policy reload when SELinux is disabled on CentOS/RHEL 6
   (bz#1493574)