diff --git a/avoid-invalid-conversion-error-with-C++.patch b/avoid-invalid-conversion-error-with-C++.patch
new file mode 100644
index 0000000..06571aa
--- /dev/null
+++ b/avoid-invalid-conversion-error-with-C++.patch
@@ -0,0 +1,22 @@
+From 371da358d1580dc06218d18a12a99611cac39e4e Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+Date: Wed, 2 Jan 2019 10:05:40 +0100
+Subject: [PATCH] Avoid invalid conversion error with C++ compilators
+
+---
+ src/pipewire/utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pipewire/utils.h b/src/pipewire/utils.h
+index 2ce9fdde..7262ff42 100644
+--- a/src/pipewire/utils.h
++++ b/src/pipewire/utils.h
+@@ -58,7 +58,7 @@ pw_spa_pod_copy(const struct spa_pod *pod)
+ 		return NULL;
+ 
+ 	size = SPA_POD_SIZE(pod);
+-	if ((c = malloc(size)) == NULL)
++	if ((c = (struct spa_pod *) malloc(size)) == NULL)
+ 		return NULL;
+ 
+ 	return (struct spa_pod *) memcpy(c, pod, size);
diff --git a/pipewire.changes b/pipewire.changes
index ed17e95..99eb0f4 100644
--- a/pipewire.changes
+++ b/pipewire.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr 19 14:27:04 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Add patch to fix use of headers from C++:
+  * avoid-invalid-conversion-error-with-C++.patch
+
 -------------------------------------------------------------------
 Thu Feb 21 13:06:16 UTC 2019 - bjorn.lie@gmail.com
 
diff --git a/pipewire.spec b/pipewire.spec
index 927d352..0456964 100644
--- a/pipewire.spec
+++ b/pipewire.spec
@@ -29,6 +29,8 @@ License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 URL:            https://pipewire.org/
 Source0:        https://github.com/PipeWire/pipewire/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
+Patch1:         avoid-invalid-conversion-error-with-C++.patch
 
 BuildRequires:  meson
 BuildRequires:  pkgconfig