diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 60fb9dce3397..9d7f279f83bf 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sawfish
 PORTVERSION= 	0.31.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
@@ -25,7 +26,7 @@ USE_IMLIB=	yes
 WANT_GNOME=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-readline
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index b67578c99867..ee5b32426df5 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -10,7 +10,7 @@ info/sawfish.info-2
 info/sawfish.info-3
 info/sawfish.info-4
 info/sawfish.info-5
-@exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish).
+@exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish).           sawfish programming manual" %D/info/sawfish.info %D/info/dir
 libexec/rep/%%GNUHOST%%/sawfish/client.so
 libexec/rep/%%GNUHOST%%/sawfish/client.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/DOC
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 60fb9dce3397..9d7f279f83bf 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sawfish
 PORTVERSION= 	0.31.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sawmill
@@ -25,7 +26,7 @@ USE_IMLIB=	yes
 WANT_GNOME=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--with-readline
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/sawfish2/pkg-plist b/x11-wm/sawfish2/pkg-plist
index b67578c99867..ee5b32426df5 100644
--- a/x11-wm/sawfish2/pkg-plist
+++ b/x11-wm/sawfish2/pkg-plist
@@ -10,7 +10,7 @@ info/sawfish.info-2
 info/sawfish.info-3
 info/sawfish.info-4
 info/sawfish.info-5
-@exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish).
+@exec install-info --section="X11 window manager" --entry="* sawfish: (sawfish).           sawfish programming manual" %D/info/sawfish.info %D/info/dir
 libexec/rep/%%GNUHOST%%/sawfish/client.so
 libexec/rep/%%GNUHOST%%/sawfish/client.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/DOC