diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 0df4489a9fc7..63db5f688dab 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -59,6 +59,8 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 CPPFLAGS+=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/lcms/include \
 		-I${LOCALBASE}/include/libpng \
+		-I${WRKSRC}/openjpeg/libopenjpeg \
+		-I${WRKSRC}/openjpeg \
 		-I${LOCALBASE}/include
 XCFLAGS=	${PTHREAD_CFLAGS}
 XLDFLAGS=	${PTHREAD_LIBS}
diff --git a/print/ghostscript9/files/patch-base-openjpeg.mak b/print/ghostscript9/files/patch-base-openjpeg.mak
index f8d9bae3f8ab..3d85cb70abf1 100644
--- a/print/ghostscript9/files/patch-base-openjpeg.mak
+++ b/print/ghostscript9/files/patch-base-openjpeg.mak
@@ -1,11 +1,11 @@
---- base/openjpeg.mak.orig	2012-02-13 10:49:36.000000000 +0900
-+++ base/openjpeg.mak	2012-02-13 10:57:41.000000000 +0900
+--- base/openjpeg.mak.orig	2012-02-08 17:48:48.000000000 +0900
++++ base/openjpeg.mak	2012-02-14 06:40:56.000000000 +0900
 @@ -101,7 +101,7 @@
  	$(SETMOD) $(OPEN_JPEG_GEN)openjpeg_0 $(open_jpeg_OBJS)
  
  # define our specific compiler
 -OPEN_JPEG_CC=$(CC) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
-+OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
++OPEN_JPEG_CC=$(CC) $(JPX_CFLAGS) $(I_)$(JPX_OPENJPEG_I_)$(_I)  $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(CFLAGS) $(D_)OPJ_STATIC$(_D) $(I_)$(OPEN_JPEG_GEN)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(_I) $(I_)$(JPX_OPENJPEG_I_)$(D)..$(_I) $(JPXCF_)
  OPEN_JPEG_O=$(O_)$(OPEN_JPEG_OBJ)$(OPEN_JPEG_PREFIX)
  
  OPEN_JPEG_DEP=$(AK) $(OPEN_JPEG_MAK)