diff --git a/ldns-1.6.17-doxyparse-perl-5-22-fix.patch b/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
new file mode 100644
index 0000000..2140ff5
--- /dev/null
+++ b/ldns-1.6.17-doxyparse-perl-5-22-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
+index 96a1732..745d564 100755
+--- a/doc/doxyparse.pl
++++ b/doc/doxyparse.pl
+@@ -273,7 +273,7 @@ foreach (keys %manpages) {
+ 
+ 	print MAN $MAN_MIDDLE;
+ 
+-	if (defined(@$also)) {
++	if (@$also) {
+ 		print MAN "\n.SH SEE ALSO\n\\fI";
+ 		print MAN join "\\fR, \\fI", @$also;
+ 		print MAN "\\fR.\nAnd ";
diff --git a/ldns.spec b/ldns.spec
index d248a87..a165792 100644
--- a/ldns.spec
+++ b/ldns.spec
@@ -26,7 +26,7 @@
 Summary: Low-level DNS(SEC) library with API
 Name: ldns
 Version: 1.6.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -34,6 +34,9 @@ Source0: http://www.nlnetlabs.nl/downloads/%{name}/%{name}-%{version}.tar.gz
 Patch1: ldns-1.6.17-multilib.patch
 Patch2: ldns-1.6.16-dsa-key-failures.patch
 Patch3: ldns-1.6.17-keygen.patch
+# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=685
+# https://bugzilla.redhat.com/show_bug.cgi?id=1230140
+Patch4: ldns-1.6.17-doxyparse-perl-5-22-fix.patch
 
 Group: System Environment/Libraries
 # Only needed for builds from svn snapshot
@@ -114,6 +117,7 @@ This package contains documentation for the ldns library
 %patch1 -p1
 %patch2 -p1 -b .dsa
 %patch3 -p1 -b .keygen
+%patch4 -p1
 # To built svn snapshots
 # rm config.guess config.sub ltmain.sh
 # aclocal
@@ -270,6 +274,9 @@ rm -rf %{buildroot}
 %doc doc
 
 %changelog
+* Thu Jul 16 2015 Tomas Hozza <thozza@redhat.com> - 1.6.17-16
+- Fix FTBFS on F23+ (#1230140)
+
 * Wed Jun 17 2015 Paul Wouters <pwouters@redhat.com> - 1.6.17-15
 - Remove obsoleted Obsolete:s
 - Fix for man page generation