diff --git a/graphic/imagemagick/imagemagick.conf b/graphic/imagemagick/imagemagick.conf
index db89d9c98..9c64ecf78 100644
--- a/graphic/imagemagick/imagemagick.conf
+++ b/graphic/imagemagick/imagemagick.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../imagemagick/imagemagick.conf
-# Copyright (C) 2008 The OpenSDE Project
+# Copyright (C) 2008 - 2009 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 # Copyright (C) 1998 - 2003 Clifford Wolf
 #
@@ -22,8 +22,12 @@ var_append configprefix " " 'CPPFLAGS="-I/usr/include/libxml2"'
 # Options
 var_append confopt ' ' "--enable-shared"
 var_append confopt ' ' "--with-modules"
-var_append confopt ' ' "--with-x"
 var_append confopt ' ' "--enable-lzw"
 
+if pkginstalled xorg-server; then
+	var_append confopt ' ' "--with-x"
+	var_append confopt ' ' "--x-includes=$(pkgprefix -r includedir xorg-server)"
+fi
+
 # Quick & Dirty hack for the perllocal problem
 . $base/package/*/perl/perllocal_hack.sh