diff --git a/var/spack/repos/builtin/packages/libbsd/cdefs.h.patch b/var/spack/repos/builtin/packages/libbsd/cdefs.h.patch
new file mode 100644
index 00000000000..acd3843a063
--- /dev/null
+++ b/var/spack/repos/builtin/packages/libbsd/cdefs.h.patch
@@ -0,0 +1,15 @@
+--- a/nclude/bsd/sys/cdefs.h.orig	2017-08-04 16:34:56.404995800 -0700
++++ b/include/bsd/sys/cdefs.h	2017-08-04 16:35:19.345043883 -0700
+@@ -25,10 +25,10 @@
+  */
+ 
+ #ifndef __has_include
+-#define __has_include 1
++#define __has_include(X) 1
+ #endif
+ #ifndef __has_include_next
+-#define __has_include_next 1
++#define __has_include_next(X) 1
+ #endif
+ 
+ #ifdef LIBBSD_OVERLAY
diff --git a/var/spack/repos/builtin/packages/libbsd/package.py b/var/spack/repos/builtin/packages/libbsd/package.py
index ab64c4babdc..1f0edc090bc 100644
--- a/var/spack/repos/builtin/packages/libbsd/package.py
+++ b/var/spack/repos/builtin/packages/libbsd/package.py
@@ -36,3 +36,5 @@ class Libbsd(AutotoolsPackage):
     url      = "https://libbsd.freedesktop.org/releases/libbsd-0.8.6.tar.xz"
 
     version('0.8.6', '4ab7bec639af17d0aacb50222b479110')
+
+    patch('cdefs.h.patch', when='%gcc@:4')