diff --git a/freeipmi-0.6.4-argmax.patch b/freeipmi-0.6.4-argmax.patch
new file mode 100644
index 0000000..71288c0
--- /dev/null
+++ b/freeipmi-0.6.4-argmax.patch
@@ -0,0 +1,19 @@
+diff -up freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h
+--- freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h.argmax	2008-07-29 13:26:05.000000000 +0200
++++ freeipmi-0.6.4/libfreeipmi/include/freeipmi/freeipmi.h	2008-07-29 13:30:16.000000000 +0200
+@@ -23,6 +23,15 @@
+ extern "C" {
+ #endif
+ 
++/* GLIBC >= 2.8 have ARG_MAX replaced by _SC_ARG_MAX */ 
++#include <unistd.h>
++#ifdef _SC_ARG_MAX
++#ifdef ARG_MAX
++#undef ARG_MAX
++#endif
++#define ARG_MAX sysconf(_SC_ARG_MAX)
++#endif
++
+ #include <freeipmi/api/ipmi-api.h>
+ #include <freeipmi/api/ipmi-chassis-cmds-api.h>
+ #include <freeipmi/api/ipmi-device-global-cmds-api.h>
diff --git a/freeipmi.spec b/freeipmi.spec
index 862d614..741bc75 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -19,6 +19,7 @@ URL: http://www.gnu.org/software/freeipmi/
 Source: ftp://ftp.zresearch.com/pub/freeipmi/%{version}/%{name}-%{version}.tar.gz
 Patch1: freeipmi-0.5.1-regex.patch
 Patch2: freeipmi-0.6.4-silent.patch
+Patch3: freeipmi-0.6.4-argmax.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libgcrypt-devel texinfo
 Requires(post): info