diff --git a/.gitignore b/.gitignore
index e445495..b32b59d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ vector-*
 /pcp-revert-pmlogger_daily-daystart.patch
 /pmcd-pmlogger-local-context.patch
 /selinux-policy-updates.patch
+/fix-pmdastatsd-build-error.patch
diff --git a/fix-pmdastatsd-build-error.patch b/fix-pmdastatsd-build-error.patch
new file mode 100644
index 0000000..3d3e21b
--- /dev/null
+++ b/fix-pmdastatsd-build-error.patch
@@ -0,0 +1,68 @@
+commit f2d39ef808c9a1a395821eec45be17b4f1734d04
+Author: Miroslav Foltýn <miroslav.foltyn01@upol.cz>
+Date:   Sun Oct 20 00:54:03 2019 +0200
+
+    Removed void casts on Ragel generated variable declarations
+
+diff --git a/src/pmdas/statsd/src/parser-ragel.rl b/src/pmdas/statsd/src/parser-ragel.rl
+index 8cb8dda76..3506205c1 100644
+--- a/src/pmdas/statsd/src/parser-ragel.rl
++++ b/src/pmdas/statsd/src/parser-ragel.rl
+@@ -194,10 +194,6 @@ ragel_parser_parse(char* str, struct statsd_datagram** datagram) {
+ 		write exec;
+ 
+ 	}%%
+-	(void)statsd_en_main;
+-	(void)statsd_error;
+-	(void)statsd_first_final;
+-	(void)_statsd_eof_actions;
+ 
+ 	if (any_tags) {
+ 		char* json = tag_collection_to_json(tags);
+
+commit 682b26b0b1d0040f267064bf92e0d61eb1771301
+Author: Miroslav Foltýn <miroslav.foltyn01@upol.cz>
+Date:   Sun Oct 20 01:06:09 2019 +0200
+
+    Removed unnecessary '-C' flag when parsing pmdastatsd ragel-parser
+
+diff --git a/src/pmdas/statsd/src/GNUmakefile b/src/pmdas/statsd/src/GNUmakefile
+index 7a9741569..77508b8fc 100644
+--- a/src/pmdas/statsd/src/GNUmakefile
++++ b/src/pmdas/statsd/src/GNUmakefile
+@@ -81,7 +81,7 @@ install_pcp : install
+ $(OBJECTS): domain.h $(RFILES)
+ 
+ $(RFILES): $(RAGELTARGET).rl
+-	$(RAGEL) -C $<
++	$(RAGEL) $<
+ 
+ $(VERSION_SCRIPT):
+ 	$(VERSION_SCRIPT_MAKERULE)
+
+commit 6f20094e3920c0ba6af818d838668fedd33e5a09
+Author: Mark Goodwin <mgoodwin@redhat.com>
+Date:   Mon Oct 21 00:56:32 2019 +1100
+
+    pmdastatsd: fix compile warnings in ragel generated code
+    
+    Restore the void casts for statsd_en_main, statsd_error and
+    statsd_first_final to fix compiler warnings on rawhide. Only
+    the void cast for _statsd_eof_actions needs to be removed
+    because that variable is no longer generated with the newer
+    version of ragel on rawhide.
+
+diff --git a/src/pmdas/statsd/src/parser-ragel.rl b/src/pmdas/statsd/src/parser-ragel.rl
+index 3506205c1..7d0166aa8 100644
+--- a/src/pmdas/statsd/src/parser-ragel.rl
++++ b/src/pmdas/statsd/src/parser-ragel.rl
+@@ -194,6 +194,9 @@ ragel_parser_parse(char* str, struct statsd_datagram** datagram) {
+ 		write exec;
+ 
+ 	}%%
++	(void)statsd_en_main;
++	(void)statsd_error;
++	(void)statsd_first_final;
+ 
+ 	if (any_tags) {
+ 		char* json = tag_collection_to_json(tags);
diff --git a/pcp.spec b/pcp.spec
index 17453aa..cad00d6 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 5.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -9,6 +9,7 @@ URL:     https://pcp.io
 Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz
 
 Patch0: pmcd-pmlogger-local-context.patch
+Patch1: fix-pmdastatsd-build-error.patch
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -2080,6 +2081,7 @@ updated policy package.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if !%{disable_python2} && 0%{?default_python} != 3
@@ -2887,7 +2889,7 @@ cd
 %if !%{disable_statsd}
 %files pmda-statsd
 %{_pmdasdir}/statsd
-%config(noreplace) %{_pmdasdir}/statsd/statsd.ini
+%config(noreplace) %{_pmdasdir}/statsd/pmdastatsd.ini
 %endif
 
 %if !%{disable_perfevent}
@@ -3184,6 +3186,10 @@ cd
 %endif
 
 %changelog
+* Sun Oct 20 2019 Mark Goodwin <mgoodwin@redhat.com> - 5.0.0-2
+- various spec fixes for pmdastatsd
+- add patch1 to fix pmdastatsd build on rawhide
+
 * Fri Oct 11 2019 Mark Goodwin <mgoodwin@redhat.com> - 5.0.0-1
 - Update to latest PCP sources.
 
diff --git a/sources b/sources
index 63d048e..45acbc7 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
 SHA512 (pcp-5.0.0.src.tar.gz) = 4a00b199343fcc33b9e4f262974e9d075892a76af92811428221ea9fbacf479a4852e2734caaff56fa6b492b0440e34db55256c91e4b89a9fe52a775645adf89
+SHA512 (pmcd-pmlogger-local-context.patch) = 8f4b6b49494781d0a711ac27738a75b1adead72cb1baef9a78754686c48ae2d278d691108233e9cf9ad33fede5ba7b7a43f4674205b9bf448f267c844ddc1a01
+SHA512 (fix-pmdastatsd-build-error.patch) = da6925df7b8bafa898870c73a7f0897b2d80941804252bb42b52554f5d1c4fbef2a60c8eef5d80b8684e53b1c316dd80da043cf3b614d5d5b8a03f7437466e75