diff --git a/SOURCES/OpenIPMI-collectd.patch b/SOURCES/OpenIPMI-collectd.patch
new file mode 100644
index 0000000..0ddfaf8
--- /dev/null
+++ b/SOURCES/OpenIPMI-collectd.patch
@@ -0,0 +1,12 @@
+diff -urNp a/unix/posix_thread_os_hnd.c b/unix/posix_thread_os_hnd.c
+--- a/unix/posix_thread_os_hnd.c	2021-08-02 15:36:49.536860558 +0200
++++ b/unix/posix_thread_os_hnd.c	2021-08-02 15:38:48.990041616 +0200
+@@ -140,8 +140,6 @@ add_fd(os_handler_t       *handler,
+     fd_data->data_ready = data_ready;
+     fd_data->handler = handler;
+     fd_data->freed = freed;
+-    sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
+-    sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED);
+     rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL,
+ 			     free_fd_data);
+     if (rv) {
diff --git a/SPECS/OpenIPMI.spec b/SPECS/OpenIPMI.spec
index 0dc9dc0..0d909af 100644
--- a/SPECS/OpenIPMI.spec
+++ b/SPECS/OpenIPMI.spec
@@ -4,7 +4,7 @@ Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 
 Version:    2.0.31
-Release:    1%{?dist}
+Release:    2%{?dist}
 License:    LGPLv2+ and GPLv2+ or BSD
 URL:        http://sourceforge.net/projects/openipmi/
 Source:     http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@ Source1:    openipmi.sysconf
 Source2:    openipmi-helper
 Source3:    ipmi.service
 Patch1:     0001-man.patch
+Patch4:     OpenIPMI-collectd.patch
 
 BuildRequires:    gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
 BuildRequires:    openssl-devel python3-devel perl-devel perl-generators
@@ -194,6 +195,9 @@ echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1
 %{_mandir}/man5/ipmi_sim_cmd.5*
 
 %changelog
+* Fri Aug  6 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.0.31-2
+- fix collectd-ipmi crash (#1990072)
+
 * Fri Jul  9 2021 Pavel Cahyna <pcahyna@redhat.com> - 2.0.31-1
 - New upstream release 2.0.31 (#1923044)