diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-include-ntp__syscall.h
similarity index 84%
rename from net/ntp4/patches/patch-aa
rename to net/ntp4/patches/patch-include-ntp__syscall.h
index bbac1a6ba92a..a713da23fcf5 100644
--- a/net/ntp4/patches/patch-aa
+++ b/net/ntp4/patches/patch-include-ntp__syscall.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2014/01/12 17:01:02 spz Exp $
+$NetBSD: patch-include-ntp__syscall.h,v 1.1 2015/10/29 11:23:47 christos Exp $
 
 --- include/ntp_syscall.h.orig	2011-03-31 10:03:53.000000000 +0000
 +++ include/ntp_syscall.h
diff --git a/net/ntp4/patches/patch-ntpd-ntpd.c b/net/ntp4/patches/patch-ntpd-ntpd.c
new file mode 100644
index 000000000000..eb7bb066ec57
--- /dev/null
+++ b/net/ntp4/patches/patch-ntpd-ntpd.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-ntpd-ntpd.c,v 1.1 2015/10/29 11:23:47 christos Exp $
+
+Apply the stupid glibc "warmup" only on linux
+
+--- ntpd/ntpd.c.orig	2015-10-21 12:14:24.000000000 -0400
++++ ntpd/ntpd.c	2015-10-29 07:20:41.000000000 -0400
+@@ -32,7 +32,9 @@
+ # ifdef HAVE_PTHREAD_H
+ #  include <pthread.h>
+ # endif
+-# define NEED_PTHREAD_WARMUP
++# ifdef __linux__
++#  define NEED_PTHREAD_WARMUP
++# endif
+ #endif
+ 
+ #ifdef HAVE_UNISTD_H