diff --git a/.gitignore b/.gitignore
index 895a4e9..de252ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /ansible-freeipa-0.3.5.tar.gz
 /ansible-freeipa-0.3.6.tar.gz
 /ansible-freeipa-0.3.8.tar.gz
+/ansible-freeipa-0.4.0.tar.gz
diff --git a/ansible-freeipa-0.3.8-Replace-json_query-in-tests-user-test_users_absent.y_rhbz#1992997.patch b/ansible-freeipa-0.3.8-Replace-json_query-in-tests-user-test_users_absent.y_rhbz#1992997.patch
deleted file mode 100644
index bbdc232..0000000
--- a/ansible-freeipa-0.3.8-Replace-json_query-in-tests-user-test_users_absent.y_rhbz#1992997.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 545d1c742231ea3151a6b0474de4c198dcbc8604 Mon Sep 17 00:00:00 2001
-From: Thomas Woerner <twoerner@redhat.com>
-Date: Wed, 11 Aug 2021 11:24:36 +0200
-Subject: [PATCH] Replace json_query in tests/user/test_users_absent.yml
-
-json_query is not part of Ansible Core. As this is the only used module
-that is not in Core it has been replaced by constructig a new dict with
-the needed user names from users dict using a loop and set_fact.
----
- tests/user/test_users_absent.yml | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/user/test_users_absent.yml b/tests/user/test_users_absent.yml
-index 752b241..d211816 100644
---- a/tests/user/test_users_absent.yml
-+++ b/tests/user/test_users_absent.yml
-@@ -12,8 +12,13 @@
-     include_vars:
-       file: users.json
- 
-+  - name: Create dict with user names
-+    set_fact:
-+      user_names: "{{ user_names | default([]) + [{ 'name': item.name }] }}"
-+    loop: "{{ users }}"
-+
-   - name: Users absent len:{{ users | length }}
-     ipauser:
-       ipaadmin_password: SomeADMINpassword
--      users: "{{ users | json_query('[*].{name: name}') }}"
-+      users: "{{ user_names }}"
-       state: absent
--- 
-2.31.1
-
diff --git a/ansible-freeipa.spec b/ansible-freeipa.spec
index d116e14..e66a1dd 100644
--- a/ansible-freeipa.spec
+++ b/ansible-freeipa.spec
@@ -7,12 +7,11 @@
 
 Summary: Roles and playbooks to deploy FreeIPA servers, replicas and clients
 Name: ansible-freeipa
-Version: 0.3.8
-Release: 3%{?dist}
+Version: 0.4.0
+Release: 1%{?dist}
 URL: https://github.com/freeipa/ansible-freeipa
 License: GPLv3+
 Source: https://github.com/freeipa/ansible-freeipa/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch1: ansible-freeipa-0.3.8-Replace-json_query-in-tests-user-test_users_absent.y_rhbz#1992997.patch
 BuildArch: noarch
 %if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
 Requires: ansible-core
@@ -107,7 +106,6 @@ to get the needed requrements to run the tests.
 %prep
 %setup -q
 # Do not create backup files with patches
-%patch1 -p1
 
 # Fix python modules and module utils:
 # - Remove shebang
@@ -151,6 +149,7 @@ cp -rp tests %{buildroot}%{_datadir}/ansible-freeipa/
 %{_datadir}/ansible/roles/ipareplica
 %{_datadir}/ansible/roles/ipaclient
 %{_datadir}/ansible/roles/ipabackup
+%{_datadir}/ansible/plugins/doc_fragments
 %{_datadir}/ansible/plugins/module_utils
 %{_datadir}/ansible/plugins/modules
 %doc README*.md
@@ -164,6 +163,15 @@ cp -rp tests %{buildroot}%{_datadir}/ansible-freeipa/
 %{_datadir}/ansible-freeipa/requirements-tests.txt
 
 %changelog
+* Tue Oct  5 2021 Thomas Woerner <twoerner@redhat.com> - 0.4.0-1
+- Update to version 0.4.0
+  https://github.com/freeipa/ansible-freeipa/releases/tag/v0.4.0
+  Resolves: RHBZ#2010622
+- Add ability to run modules remotely
+  Resolves: RHBZ#2010633
+- New management module ipaautomountlocation
+  Resolves: RHBZ#2010643
+
 * Mon Aug 16 2021 Thomas Woerner <twoerner@redhat.com> - 0.3.8-3
 - Add requirement for ansible-core
   Resolves: RHBZ#1993857
diff --git a/sources b/sources
index bb17225..7f0e119 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ansible-freeipa-0.3.8.tar.gz) = 2bef7a2f69184583d352bb65f227a7a693afeebaa051eeadb2815c2658428bb225c9ad56545f79e28efaec47741f9b47dff8fcbb4997adda5326b55a123143de
+SHA512 (ansible-freeipa-0.4.0.tar.gz) = eb0ab68c359c24daeb590cbd3b264060f03aabb5a292b1b781fbe1ea1974831f401201fa4514bbbf8b2ccb83eab6dd0b6ff9f3f1842b7afd753de47297282d92