diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index bca110541bf..4df9d66ba22 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -112,7 +112,7 @@ AC_DEFUN(PHP_GD_XPM,[
     fi
 
     for i in include include/X11; do
-      test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i
+      test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
     done
 
     if test -z "$GD_XPM_INC"; then
diff --git a/ext/gd/libgd/gdxpm.c b/ext/gd/libgd/gdxpm.c
index b7eb92e333c..c95cb72a031 100644
--- a/ext/gd/libgd/gdxpm.c
+++ b/ext/gd/libgd/gdxpm.c
@@ -20,7 +20,7 @@ gdImageCreateFromXpm (char *filename)
 
 #else
 
-#include "xpm.h"
+#include <X11/xpm.h>
 #include <string.h>
 
 gdImagePtr