diff --git a/syslog-ng-3.11.1_json-c_013.patch b/syslog-ng-3.11.1_json-c_013.patch
new file mode 100644
index 0000000..67d73df
--- /dev/null
+++ b/syslog-ng-3.11.1_json-c_013.patch
@@ -0,0 +1,21 @@
+commit 58bfd2e21b44413f08eb92cd6702b1f0402d1498
+Author: Björn Esser <besser82@fedoraproject.org>
+Date:   Mon Dec 11 15:46:06 2017 +0100
+
+    modules/json: Adaptions for json-c v0.13
+
+diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
+index 0368ed8f..787cc261 100644
+--- a/modules/json/json-parser.c
++++ b/modules/json/json-parser.c
+@@ -28,7 +28,10 @@
+ #include <ctype.h>
+ 
+ #include <json.h>
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < 1300)
+ #include <json_object_private.h>
++#endif
+ 
+ typedef struct _JSONParser
+ {
diff --git a/syslog-ng.spec b/syslog-ng.spec
index b67e156..36c0c02 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,7 +2,7 @@
 
 Name: syslog-ng
 Version: 3.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -13,6 +13,9 @@ Source1: syslog-ng.conf
 Source2: syslog-ng.logrotate
 Source3: syslog-ng.service
 
+# Upstreamed: https://github.com/balabit/syslog-ng/pull/1810
+Patch0: syslog-ng-3.11.1_json-c_013.patch
+
 BuildRequires: perl-generators
 BuildRequires: systemd-units
 BuildRequires: pkgconfig
@@ -165,7 +168,7 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q
+%autosetup -p 1
 
 # fix perl path
 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl
@@ -390,6 +393,9 @@ fi
 
 
 %changelog
+* Mon Dec 11 2017 Björn Esser <besser82@fedoraproject.org> - 3.11.1-3
+- Add patch for building cleanly against json-c v0.13
+
 * Sun Dec 10 2017 Björn Esser <besser82@fedoraproject.org> - 3.11.1-2
 - Rebuilt for libjson-c.so.3