diff --git a/ChangeLog b/ChangeLog
index 178541f7..2d4347a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 28 19:00:39 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* configure.in xpath.c: applied Bjorn patches for FPE on the
+	  alpha
+
 Sat Apr 28 18:54:28 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
 
 	* tree.[ch] xmlIO.h: applied patch from Joe McAlerney to add
diff --git a/configure.in b/configure.in
index b7e368f9..90e09715 100644
--- a/configure.in
+++ b/configure.in
@@ -157,14 +157,18 @@ dnl
 XML_CFLAGS=""
 
 dnl
-dnl Workaround for HP native compiler
-dnl http://bugs.gnome.org/db/31/3163.html
+dnl Workaround for native compilers
+dnl  HP  : http://bugs.gnome.org/db/31/3163.html
+dnl  DEC : Enable NaN/Inf
 dnl
 if test "${GCC}" != "yes" ; then
     case "${host}" in
           *-*-hpux* )
 	       CFLAGS="${CFLAGS} -Wp,-H30000"
 	       ;;
+          *-dec-osf* )
+               CFLAGS="${CFLAGS} -ieee"
+               ;;
     esac
 else
     CFLAGS="${CFLAGS} -Wall"
diff --git a/xpath.c b/xpath.c
index 23910635..5b6e84c1 100644
--- a/xpath.c
+++ b/xpath.c
@@ -39,6 +39,10 @@
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+#if defined(__osf__) && defined(__GNUC__)
+#include <signal.h>
+#define FPE_WORKAROUND
+#endif
 
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
@@ -157,6 +161,10 @@ xmlXPathInit(void) {
 
     if (initialized) return;
 
+#ifdef FPE_WORKAROUND
+    signal(SIGFPE, SIG_IGN);
+#endif
+
 #ifdef XPATH_USE_DIVISION_SHORTCUTS
     xmlXPathNAN = 0;
     xmlXPathNAN /= 0.0;