diff --git a/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch b/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch
new file mode 100644
index 0000000..7e992a2
--- /dev/null
+++ b/Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch
@@ -0,0 +1,21 @@
+commit 16a19ee4c568047fb03581b23b4fcb273a615474
+Author: Scott Pakin <pakin@lanl.gov>
+Date:   Wed Feb 19 13:43:40 2020 -0700
+
+    Replace deprecated MPI_Errhandler_set with newer MPI_Comm_set_errhandler
+    
+    Resolves #17.
+
+diff --git src/init.c src/init.c
+index cd070a785c41..46b1127e538d 100644
+--- src/init.c
++++ src/init.c
+@@ -77,7 +77,7 @@ mpi_init_builtin (WORD_LIST *list)
+ 
+   /* Make MPI errors return instead of crash.  Also, store our rank
+    * and number of ranks. */
+-  MPI_Errhandler_set (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
++  MPI_Comm_set_errhandler (MPI_COMM_WORLD, MPI_ERRORS_RETURN);
+   MPI_Comm_rank (MPI_COMM_WORLD, &mpibash_rank);
+   MPI_Comm_size (MPI_COMM_WORLD, &mpibash_num_ranks);
+ 
diff --git a/mpibash.changes b/mpibash.changes
index 70c86bb..dd03fbd 100644
--- a/mpibash.changes
+++ b/mpibash.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  4 15:06:22 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- Add Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch
+  to fix compilation with openmpi4
+
 -------------------------------------------------------------------
 Mon May 27 08:37:37 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
diff --git a/mpibash.spec b/mpibash.spec
index 971d9c7..dcc7c8f 100644
--- a/mpibash.spec
+++ b/mpibash.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mpibash
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,8 +22,9 @@ Release:        0
 Summary:        Parallel scripting right from the Bourne-Again Shell
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Other
-Url:            https://github.com/lanl/MPI-Bash
+URL:            https://github.com/lanl/MPI-Bash
 Source0:        https://github.com/lanl/MPI-Bash/releases/download/v%{version}/mpibash-%{version}.tar.gz
+Patch0:         Replace-deprecated-MPI_Errhandler_set-with-newer-MPI_Comm_set_errhandler.patch
 BuildRequires:  bash-devel >= 4.4
 BuildRequires:  libcircle-devel
 BuildRequires:  openmpi-macros-devel
@@ -49,9 +50,9 @@ Linux commands independently over a large number of input files.
 
 This package contains example scripts for mpibash.
 
-
 %prep
 %setup -q
+%patch0
 
 %build
 %setup_openmpi