diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile
index bc7cfc77917d..7a88854c86c3 100644
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Data interchange format library
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_sparc64=	fails to compile: no atomic ops available
+
 TEST_DEPENDS=	googlemock>=0:devel/googlemock \
 		googletest>=0:devel/googletest
 
-BROKEN_sparc64=	fails to compile: no atomic ops available
-
 CFLAGS+=	-DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src
 CONFIGURE_ENV=	CXX_FOR_BUILD=c++
 GNU_CONFIGURE=	yes
diff --git a/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h b/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
index 3db5efd75217..ff62c2c46cf4 100644
--- a/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
+++ b/devel/protobuf/files/patch-src-google-protobuf-stubs-atomicops.h
@@ -1,11 +1,11 @@
---- src/google/protobuf/stubs/atomicops.h.orig	2016-09-24 02:12:45 UTC
+--- src/google/protobuf/stubs/atomicops.h.orig	2017-08-15 23:39:12 UTC
 +++ src/google/protobuf/stubs/atomicops.h
-@@ -202,6 +202,8 @@ Atomic64 Release_Load(volatile const Ato
+@@ -198,6 +198,8 @@ Atomic64 Release_Load(volatile const Ato
  #elif defined(__GNUC__)
  #if defined(GOOGLE_PROTOBUF_ARCH_IA32) || defined(GOOGLE_PROTOBUF_ARCH_X64)
  #include <google/protobuf/stubs/atomicops_internals_x86_gcc.h>
 +#elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__FreeBSD__)
 +#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>
  #elif defined(GOOGLE_PROTOBUF_ARCH_ARM) && defined(__linux__)
- #include <google/protobuf/stubs/atomicops_internals_arm_gcc.h>
- #elif defined(GOOGLE_PROTOBUF_ARCH_AARCH64)
+ #if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
+ #include <google/protobuf/stubs/atomicops_internals_generic_gcc.h>