diff --git a/fix-non-executable-script-errors.patch b/fix-non-executable-script-errors.patch
deleted file mode 100644
index ca494c5..0000000
--- a/fix-non-executable-script-errors.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -uNr a/heartbeat/findif.sh b/heartbeat/findif.sh
---- a/heartbeat/findif.sh	2016-02-03 11:57:55.000000000 +0100
-+++ b/heartbeat/findif.sh	2016-02-08 16:55:32.155404148 +0100
-@@ -1,4 +1,3 @@
--#!/bin/sh
- ipcheck_ipv4() {
-   local r1_to_255="([1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"
-   local r0_to_255="([0-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-5])"
-diff -uNr a/heartbeat/mysql-common.sh b/heartbeat/mysql-common.sh
---- a/heartbeat/mysql-common.sh	2016-02-03 11:57:55.000000000 +0100
-+++ b/heartbeat/mysql-common.sh	2016-02-08 16:55:01.619815789 +0100
-@@ -1,7 +1,3 @@
--#!/bin/sh
--
--#######################################################################
--
- # Attempt to detect a default binary
- OCF_RESKEY_binary_default=$(which mysqld_safe 2> /dev/null)
- if [ "$OCF_RESKEY_binary_default" = "" ]; then
diff --git a/resource-agents.spec b/resource-agents.spec
index 04a6652..4665c12 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -20,7 +20,7 @@
 #
 
 %global upstream_prefix ClusterLabs-resource-agents
-%global upstream_version 539ed604
+%global upstream_version 5a1edf2b
 
 # SSLeay (required by ldirectord)
 %if 0%{?suse_version}
@@ -35,8 +35,8 @@
 
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
-Version:	4.1.0
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Version:	4.1.1
+Release:	1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -141,8 +141,8 @@ The Linux Director Daemon (ldirectord) was written by Jacob Rief.
 
 ldirectord is a stand alone daemon for monitoring the services on real
 servers. Currently, HTTP, HTTPS, and FTP services are supported.
-lditrecord is simple to install and works with the heartbeat code
-(http://www.linux-ha.org/).
+ldirectord is simple to install and works with Pacemaker
+(http://clusterlabs.org/).
 
 See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 %endif
@@ -184,6 +184,9 @@ export CFLAGS
 	%{conf_opt_fatal} \
 %if %{defined _unitdir}
     --with-systemdsystemunitdir=%{_unitdir} \
+%endif
+%if %{defined _tmpfilesdir}
+    --with-systemdtmpfilesdir=%{_tmpfilesdir} \
 %endif
 	--with-pkg-name=%{name} \
 	--with-ras-set=%{rasset}
@@ -260,14 +263,16 @@ test -d %{buildroot}/sbin || mkdir %{buildroot}/sbin
 
 %{_sbindir}/ocf-tester
 %{_sbindir}/ocft
-#%{_sbindir}/sfex_init
-#%{_sbindir}/sfex_stat
+#%%{_sbindir}/sfex_init
+#%%{_sbindir}/sfex_stat
 
 %{_includedir}/heartbeat
 
+%dir %attr (1755, root, root)	%{_var}/run/resource-agents
+
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/ocf-tester.8*
-#%{_mandir}/man8/sfex_init.8*
+#%%{_mandir}/man8/sfex_init.8*
 
 # For compatability with pre-existing agents
 %dir %{_sysconfdir}/ha.d
@@ -333,6 +338,9 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %endif
 
 %changelog
+* Tue Mar 13 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.1-1
+- Rebase to resource-agents 4.1.1 upstream release.
+
 * Mon Feb 19 2018 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.1.0-2
 - Add gcc to BuildRequires
 
diff --git a/sources b/sources
index ba480e3..2da0f50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ClusterLabs-resource-agents-539ed604.tar.gz) = c30aa93092127e3dcb2664ca9a3035016141b92a65de715425a4b8c27dd0cac219e639549b4e1c61a81d8f21f4683acb45c59cd8fae10bf686d4b0da9e6f0a71
+SHA512 (ClusterLabs-resource-agents-5a1edf2b.tar.gz) = 1a3964c02a59743a7953ea07568a1e75e791e73f2c6b9a21cf1593d18cd52f0201468816bd957a2953406e2dd5b5a8623d744fff0442eea1000db753464bf10b