diff --git a/nagios-plugins-1.4.13-ntp.patch b/nagios-plugins-1.4.13-ntp.patch
new file mode 100644
index 0000000..b80c775
--- /dev/null
+++ b/nagios-plugins-1.4.13-ntp.patch
@@ -0,0 +1,23 @@
+--- nagiosplug/trunk/plugins/check_ntp.c    2008/11/19 05:59:22 2085
++++ nagiosplug/trunk/plugins/check_ntp.c    2008/11/19 05:59:33 2086
+@@ -198,7 +198,7 @@
+ /* NTP control message header is 12 bytes, plus any data in the data
+  * field, plus null padding to the nearest 32-bit boundary per rfc.
+  */
+-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0))
++#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0))
+ 
+ /* finally, a little helper or two for debugging: */
+ #define DBG(x) do{if(verbose>1){ x; }}while(0);
+--- nagiosplug/trunk/plugins/check_ntp_peer.c   2008/11/19 05:59:22 2085
++++ nagiosplug/trunk/plugins/check_ntp_peer.c   2008/11/19 05:59:33 2086
+@@ -131,7 +131,7 @@
+ /* NTP control message header is 12 bytes, plus any data in the data
+  * field, plus null padding to the nearest 32-bit boundary per rfc.
+  */
+-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((m.count)?4-(ntohs(m.count)%4):0))
++#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0))
+ 
+ /* finally, a little helper or two for debugging: */
+ #define DBG(x) do{if(verbose>1){ x; }}while(0);
+
diff --git a/nagios-plugins.spec b/nagios-plugins.spec
index 3948ead..12d9413 100644
--- a/nagios-plugins.spec
+++ b/nagios-plugins.spec
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.13
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -12,6 +12,7 @@ Patch0: nagios-plugins-1.4.3-subst.patch
 Patch1: nagios-plugins-1.4.3-ntpd.patch
 Patch2: nagios-plugins-check_log-path.patch
 Patch3: nagios-plugins-1.4.13-linux_raid.patch
+Patch4: nagios-plugins-1.4.13-ntp.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -514,6 +515,7 @@ Provides check_wave support for Nagios.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p0
+%patch4 -p2
 
 %build
 %configure \
@@ -807,6 +809,9 @@ rm -rf %{buildroot}
 %{_libdir}/nagios/plugins/utils.sh
 
 %changelog
+* Mon Jun 22 2009 Mike McGrath <mmcgrath@redhat.com> - 1.4.13-15
+- Added patch from upstream to fix ntp faults (bz #479030)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.13-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild