diff --git a/external/bsd/ntp/lib/libiscntp/Makefile b/external/bsd/ntp/lib/libiscntp/Makefile
index ce38b046c270..c30f565092f8 100644
--- a/external/bsd/ntp/lib/libiscntp/Makefile
+++ b/external/bsd/ntp/lib/libiscntp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -44,7 +44,7 @@ SRCS=   assertions.c               \
         time.c                     \
         sockaddr.c
 
-.if ${HAVE_GCC} != 4
+.if ${HAVE_GCC:U} != 4
 COPTS.log.c+=	-Wno-error=format-nonliteral
 .endif
 
diff --git a/external/bsd/ntp/lib/libntp/Makefile b/external/bsd/ntp/lib/libntp/Makefile
index e96cc8de0453..de8f0e45d401 100644
--- a/external/bsd/ntp/lib/libntp/Makefile
+++ b/external/bsd/ntp/lib/libntp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2014/12/23 20:19:08 christos Exp $
+#	$NetBSD: Makefile,v 1.17 2014/12/23 20:26:30 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -79,10 +79,10 @@ ymd2yd.c
 
 CPPFLAGS+= -I${IDIST}/sntp/libopts
 
-.if ${HAVE_GCC} != 4
-COPTS.msyslog.c+=	-Wno-error=format-nonliteral
-.else
+.if ${HAVE_GCC:U} == 4
 COPTS.systime.c+=	-Wno-uninitialized
+.else
+COPTS.msyslog.c+=	-Wno-error=format-nonliteral
 .endif
 
 # For MKREPRO, avoid using __DATE__ and __TIME__.
diff --git a/external/bsd/ntp/lib/libopts/Makefile b/external/bsd/ntp/lib/libopts/Makefile
index 8afd97aebdce..f255286f0f36 100644
--- a/external/bsd/ntp/lib/libopts/Makefile
+++ b/external/bsd/ntp/lib/libopts/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2014/12/23 20:19:08 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2014/12/23 20:26:30 joerg Exp $
 
 LIBISPRIVATE=yes
 
@@ -17,10 +17,10 @@ CPPFLAGS+=-I${DIST}
 SRCS=libopts.c
 
 COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
-.if ${HAVE_GCC} != 4
-COPTS.libopts.c+=	${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
-.else
+.if ${HAVE_GCC:U} == 4
 COPTS.libopts.c+=	-Wno-error
+.else
+COPTS.libopts.c+=	${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
 .endif
 
 .include <bsd.lib.mk>