diff --git a/lib/ansible/modules/system/java_keystore.py b/lib/ansible/modules/system/java_keystore.py
new file mode 100644
index 0000000000..1176ae661e
--- /dev/null
+++ b/lib/ansible/modules/system/java_keystore.py
@@ -0,0 +1,288 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# (c) 2016, Guillaume Grossetie <ggrossetie@yuzutech.fr>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+ANSIBLE_METADATA = {'metadata_version': '1.1',
+                    'status': ['preview'],
+                    'supported_by': 'community'}
+
+
+DOCUMENTATION = '''
+---
+module: java_keystore
+short_description: Create or delete a Java keystore in JKS format.
+description:
+     - Create or delete a Java keystore in JKS format for a given certificate.
+version_added: "2.7"
+options:
+    name:
+        description:
+          - Name of the certificate.
+        required: true
+    certificate:
+        description:
+          - Certificate that should be used to create the key store.
+        required: false
+    private_key:
+        description:
+          - Private key that should be used to create the key store.
+        required: false
+    password:
+        description:
+          - Password that should be used to secure the key store.
+        required: false
+    dest:
+        description:
+          - Absolute path where the jks should be generated.
+        required: true
+    owner:
+        description:
+          - Name of the user that should own jks file.
+        required: false
+    group:
+        description:
+          - Name of the group that should own jks file.
+        required: false
+    mode:
+        description:
+          - Mode the file should be.
+        required: false
+    force:
+        description:
+          - Key store will be created even if it already exists.
+        required: false
+        type: bool
+        default: 'no'
+requirements: [openssl, keytool]
+author: Guillaume Grossetie
+'''
+
+EXAMPLES = '''
+# Create a key store for the given certificate (inline)
+- java_keystore:
+    certificate: |
+      -----BEGIN CERTIFICATE-----
+      h19dUZ2co2fI/ibYiwxWk4aeNE6KWvCaTQOMQ8t6Uo2XKhpL/xnjoAgh1uCQN/69
+      MG+34+RhUWzCfdZH7T8/qDxJw2kEPKluaYh7KnMsba+5jHjmtzix5QIDAQABo4IB
+      -----END CERTIFICATE-----
+    private_key: |
+      -----BEGIN RSA PRIVATE KEY-----
+      DBVFTEVDVFJJQ0lURSBERSBGUkFOQ0UxFzAVBgNVBAsMDjAwMDIgNTUyMDgxMzE3
+      GLlDNMw/uHyME7gHFsqJA7O11VY6O5WQ4IDP3m/s5ZV6s+Nn6Lerz17VZ99
+      -----END RSA PRIVATE KEY-----
+    password: changeit
+    dest: /etc/security/keystore.jks
+
+# Create a key store for the given certificate (lookup)
+- java_keystore:
+    certificate: "{{lookup('file', '/path/to/certificate.crt') }}"
+    private_key: "{{lookup('file', '/path/to/private.key') }}"
+    password: changeit
+    dest: /etc/security/keystore.jks
+'''
+
+RETURN = '''
+msg:
+  description: Output from stdout of keytool/openssl command after execution of given command or an error.
+  returned: changed and failure
+  type: string
+  sample: "Unable to find the current certificate fingerprint in ..."
+
+rc:
+  description: keytool/openssl command execution return value
+  returned: changed and failure
+  type: int
+  sample: "0"
+
+cmd:
+  description: Executed command to get action done
+  returned: changed and failure
+  type: string
+  sample: "openssl x509 -noout -in /tmp/cert.crt -fingerprint -sha1"
+'''
+
+
+from ansible.module_utils.basic import AnsibleModule
+import os
+import re
+
+
+def read_certificate_fingerprint(module, openssl_bin, certificate_path):
+    current_certificate_fingerprint_cmd = "%s x509 -noout -in %s -fingerprint -sha1" % (openssl_bin, certificate_path)
+    (rc, current_certificate_fingerprint_out, current_certificate_fingerprint_err) = run_commands(module, current_certificate_fingerprint_cmd)
+    if rc != 0:
+        return module.fail_json(msg=current_certificate_fingerprint_out,
+                                err=current_certificate_fingerprint_err,
+                                rc=rc,
+                                cmd=current_certificate_fingerprint_cmd)
+
+    current_certificate_match = re.search(r"=([\w:]+)", current_certificate_fingerprint_out)
+    if not current_certificate_match:
+        return module.fail_json(
+            msg="Unable to find the current certificate fingerprint in %s" % current_certificate_fingerprint_out,
+            rc=rc,
+            cmd=current_certificate_fingerprint_err
+        )
+
+    return current_certificate_match.group(1)
+
+
+def read_stored_certificate_fingerprint(module, keytool_bin, alias, keystore_path, keystore_password):
+    stored_certificate_fingerprint_cmd = "%s -list -alias '%s' -keystore '%s' -storepass '%s'" % (keytool_bin, alias, keystore_path, keystore_password)
+    (rc, stored_certificate_fingerprint_out, stored_certificate_fingerprint_err) = run_commands(module, stored_certificate_fingerprint_cmd)
+    if rc != 0:
+        if "keytool error: java.lang.Exception: Alias <%s> does not exist" % alias not in stored_certificate_fingerprint_out:
+            return module.fail_json(msg=stored_certificate_fingerprint_out,
+                                    err=stored_certificate_fingerprint_err,
+                                    rc=rc,
+                                    cmd=stored_certificate_fingerprint_cmd)
+        else:
+            return None
+    else:
+        stored_certificate_match = re.search(r": ([\w:]+)", stored_certificate_fingerprint_out)
+        if not stored_certificate_match:
+            return module.fail_json(
+                msg="Unable to find the stored certificate fingerprint in %s" % stored_certificate_fingerprint_out,
+                rc=rc,
+                cmd=stored_certificate_fingerprint_cmd
+            )
+
+        return stored_certificate_match.group(1)
+
+
+def run_commands(module, cmd, check_rc=True):
+    return module.run_command(cmd, check_rc)
+
+
+def create_file(path, content):
+    with open(path, 'wb') as f:
+        f.write(content)
+    return path
+
+
+def create_tmp_certificate(module):
+    return create_file("/tmp/%s.crt" % module.params['name'], module.params['certificate'])
+
+
+def create_tmp_private_key(module):
+    return create_file("/tmp/%s.key" % module.params['name'], module.params['private_key'])
+
+
+def cert_changed(module, openssl_bin, keytool_bin, keystore_path, keystore_pass, alias):
+    certificate_path = create_tmp_certificate(module)
+    try:
+        current_certificate_fingerprint = read_certificate_fingerprint(module, openssl_bin, certificate_path)
+        stored_certificate_fingerprint = read_stored_certificate_fingerprint(module, keytool_bin, alias, keystore_path, keystore_pass)
+        return current_certificate_fingerprint != stored_certificate_fingerprint
+    finally:
+        os.remove(certificate_path)
+
+
+def create_jks(module, name, openssl_bin, keytool_bin, keystore_path, password):
+    if module.check_mode:
+        module.exit_json(changed=True)
+    else:
+        certificate_path = create_tmp_certificate(module)
+        private_key_path = create_tmp_private_key(module)
+        try:
+            if os.path.exists(keystore_path):
+                os.remove(keystore_path)
+
+            keystore_p12_path = "/tmp/keystore.p12"
+            if os.path.exists(keystore_p12_path):
+                os.remove(keystore_p12_path)
+
+            export_p12_cmd = "%s pkcs12 -export -name '%s' -in '%s' -inkey '%s' -out '%s' -passout 'pass:%s'" % (
+                openssl_bin, name, certificate_path, private_key_path, keystore_p12_path, password)
+            (rc, export_p12_out, export_p12_err) = run_commands(module, export_p12_cmd)
+            if rc != 0:
+                return module.fail_json(msg=export_p12_out,
+                                        rc=rc,
+                                        cmd=export_p12_cmd)
+
+            import_keystore_cmd = "%s -importkeystore " \
+                                  "-destkeystore '%s' " \
+                                  "-srckeystore '%s' " \
+                                  "-srcstoretype pkcs12 " \
+                                  "-alias '%s' " \
+                                  "-deststorepass '%s' " \
+                                  "-srcstorepass '%s' " \
+                                  "-noprompt" % (keytool_bin, keystore_path, keystore_p12_path, name, password, password)
+            (rc, import_keystore_out, import_keystore_err) = run_commands(module, import_keystore_cmd)
+            if rc == 0:
+                update_jks_perm(module, keystore_path)
+                return module.exit_json(changed=True,
+                                        msg=import_keystore_out,
+                                        rc=rc,
+                                        cmd=import_keystore_cmd,
+                                        stdout_lines=import_keystore_out)
+            else:
+                return module.fail_json(msg=import_keystore_out,
+                                        rc=rc,
+                                        cmd=import_keystore_cmd)
+        finally:
+            os.remove(certificate_path)
+            os.remove(private_key_path)
+
+
+def update_jks_perm(module, keystore_path):
+    module.params['path'] = keystore_path
+    file_args = module.load_file_common_arguments(module.params)
+    module.set_fs_attributes_if_different(file_args, False)
+
+
+def process_jks(module):
+    name = module.params['name']
+    password = module.params['password']
+    keystore_path = module.params['dest']
+    force = module.params['force']
+    openssl_bin = module.get_bin_path('openssl', True)
+    keytool_bin = module.get_bin_path('keytool', True)
+
+    if os.path.exists(keystore_path):
+        if force:
+            create_jks(module, name, openssl_bin, keytool_bin, keystore_path, password)
+        else:
+            if cert_changed(module, openssl_bin, keytool_bin, keystore_path, password, name):
+                create_jks(module, name, openssl_bin, keytool_bin, keystore_path, password)
+            else:
+                if not module.check_mode:
+                    update_jks_perm(module, keystore_path)
+                return module.exit_json(changed=False)
+    else:
+        create_jks(module, name, openssl_bin, keytool_bin, keystore_path, password)
+
+
+class ArgumentSpec(object):
+    def __init__(self):
+        self.supports_check_mode = True
+        self.add_file_common_args = True
+        argument_spec = dict(
+            name=dict(required=True),
+            certificate=dict(required=True, no_log=True),
+            private_key=dict(required=True, no_log=True),
+            password=dict(required=True, no_log=True),
+            dest=dict(required=True),
+            force=dict(required=False, default=False, type='bool')
+        )
+        self.argument_spec = argument_spec
+
+
+def main():
+    spec = ArgumentSpec()
+    module = AnsibleModule(
+        argument_spec=spec.argument_spec,
+        add_file_common_args=spec.add_file_common_args,
+        supports_check_mode=spec.supports_check_mode
+    )
+    process_jks(module)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/test/units/modules/system/test_java_keystore.py b/test/units/modules/system/test_java_keystore.py
new file mode 100644
index 0000000000..42dc6dc481
--- /dev/null
+++ b/test/units/modules/system/test_java_keystore.py
@@ -0,0 +1,248 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2018, Ansible Project
+# Copyright (c) 2018, Abhijeet Kasurde <akasurde@redhat.com>
+#
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from units.modules.utils import ModuleTestCase, set_module_args
+from ansible.compat.tests.mock import patch
+from ansible.compat.tests.mock import Mock
+from ansible.module_utils.basic import AnsibleModule
+from ansible.modules.system.java_keystore import create_jks, cert_changed, ArgumentSpec
+
+
+class TestCreateJavaKeystore(ModuleTestCase):
+    """Test the creation of a Java keystore."""
+
+    def setUp(self):
+        """Setup."""
+        super(TestCreateJavaKeystore, self).setUp()
+        self.spec = ArgumentSpec()
+        self.mock_create_file = patch('ansible.modules.system.java_keystore.create_file',
+                                      side_effect=lambda path, content: path)
+        self.mock_run_commands = patch('ansible.modules.system.java_keystore.run_commands')
+        self.run_commands = self.mock_run_commands.start()
+        self.create_file = self.mock_create_file.start()
+
+    def tearDown(self):
+        """Teardown."""
+        super(TestCreateJavaKeystore, self).tearDown()
+        self.mock_create_file.stop()
+        self.mock_run_commands.stop()
+
+    def test_create_jks_success(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        module.exit_json = Mock()
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = lambda args, kwargs: (0, '', '')
+            create_jks(module, "test", "openssl", "keytool", "/etc/security/keystore.jks", "changeit")
+            module.exit_json.assert_called_once_with(
+                changed=True,
+                cmd="keytool -importkeystore "
+                    "-destkeystore '/etc/security/keystore.jks' "
+                    "-srckeystore '/tmp/keystore.p12' -srcstoretype pkcs12 -alias 'test' "
+                    "-deststorepass 'changeit' -srcstorepass 'changeit' -noprompt",
+                msg='',
+                rc=0,
+                stdout_lines=''
+            )
+
+    def test_create_jks_fail_export_pkcs12(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        module.fail_json = Mock()
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(1, '', ''), (0, '', '')]
+            create_jks(module, "test", "openssl", "keytool", "/etc/security/keystore.jks", "changeit")
+            module.fail_json.assert_called_once_with(
+                cmd="openssl pkcs12 -export -name 'test' "
+                    "-in '/tmp/foo.crt' -inkey '/tmp/foo.key' "
+                    "-out '/tmp/keystore.p12' "
+                    "-passout 'pass:changeit'",
+                msg='',
+                rc=1
+            )
+
+    def test_create_jks_fail_import_key(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        module.fail_json = Mock()
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(0, '', ''), (1, '', '')]
+            create_jks(module, "test", "openssl", "keytool", "/etc/security/keystore.jks", "changeit")
+            module.fail_json.assert_called_once_with(
+                cmd="keytool -importkeystore "
+                    "-destkeystore '/etc/security/keystore.jks' "
+                    "-srckeystore '/tmp/keystore.p12' -srcstoretype pkcs12 -alias 'test' "
+                    "-deststorepass 'changeit' -srcstorepass 'changeit' -noprompt",
+                msg='',
+                rc=1
+            )
+
+
+class TestCertChanged(ModuleTestCase):
+    """Test if the cert has changed."""
+
+    def setUp(self):
+        """Setup."""
+        super(TestCertChanged, self).setUp()
+        self.spec = ArgumentSpec()
+        self.mock_create_file = patch('ansible.modules.system.java_keystore.create_file',
+                                      side_effect=lambda path, content: path)
+        self.mock_run_commands = patch('ansible.modules.system.java_keystore.run_commands')
+        self.run_commands = self.mock_run_commands.start()
+        self.create_file = self.mock_create_file.start()
+
+    def tearDown(self):
+        """Teardown."""
+        super(TestCertChanged, self).tearDown()
+        self.mock_create_file.stop()
+        self.mock_run_commands.stop()
+
+    def test_cert_unchanged_same_fingerprint(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(0, 'foo=abcd:1234:efgh', ''), (0, 'foo: abcd:1234:efgh', '')]
+            result = cert_changed(module, "openssl", "keytool", "/etc/security/keystore.jks", "changeit", 'foo')
+            self.assertFalse(result, 'Fingerprint is identical')
+
+    def test_cert_changed_fingerprint_mismatch(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(0, 'foo=abcd:1234:efgh', ''), (0, 'foo: wxyz:9876:stuv', '')]
+            result = cert_changed(module, "openssl", "keytool", "/etc/security/keystore.jks", "changeit", 'foo')
+            self.assertTrue(result, 'Fingerprint mismatch')
+
+    def test_cert_changed_alias_does_not_exist(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(0, 'foo=abcd:1234:efgh', ''),
+                                             (1, 'keytool error: java.lang.Exception: Alias <foo> does not exist', '')]
+            result = cert_changed(module, "openssl", "keytool", "/etc/security/keystore.jks", "changeit", 'foo')
+            self.assertTrue(result, 'Certificate does not exist')
+
+    def test_cert_changed_fail_read_cert(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        module.fail_json = Mock()
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(1, '', 'Oops'), (0, 'foo: wxyz:9876:stuv', '')]
+            cert_changed(module, "openssl", "keytool", "/etc/security/keystore.jks", "changeit", 'foo')
+            module.fail_json.assert_called_once_with(
+                cmd="openssl x509 -noout -in /tmp/foo.crt -fingerprint -sha1",
+                msg='',
+                err='Oops',
+                rc=1
+            )
+
+    def test_cert_changed_fail_read_keystore(self):
+        set_module_args(dict(
+            certificate='cert-foo',
+            private_key='private-foo',
+            dest='/etc/security/keystore.jks',
+            name='foo',
+            password='changeit'
+        ))
+
+        module = AnsibleModule(
+            argument_spec=self.spec.argument_spec,
+            supports_check_mode=self.spec.supports_check_mode
+        )
+
+        module.fail_json = Mock(return_value=True)
+
+        with patch('os.remove', return_value=True):
+            self.run_commands.side_effect = [(0, 'foo: wxyz:9876:stuv', ''), (1, '', 'Oops')]
+            cert_changed(module, "openssl", "keytool", "/etc/security/keystore.jks", "changeit", 'foo')
+            module.fail_json.assert_called_with(
+                cmd="keytool -list -alias 'foo' -keystore '/etc/security/keystore.jks' -storepass 'changeit'",
+                msg='',
+                err='Oops',
+                rc=1
+            )