diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile
index f5f302cf7bf..c4928b74245 100644
--- a/x11/sawfish/Makefile
+++ b/x11/sawfish/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2004/12/19 17:27:00 alek Exp $
+# $OpenBSD: Makefile,v 1.16 2005/05/23 20:29:45 marius Exp $
 
 COMMENT=	"extensible window manager"
 
-VERSION=	0.36
+VERSION=	1.3
 DISTNAME=	sawfish-${VERSION}
 CATEGORIES=	x11
 
@@ -36,8 +36,9 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --without-audiofile --without-esd \
 		 --disable-capplet --disable-themer \
 		 --disable-gnome-widgets --disable-linguas
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I{X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PKG_CONFIG_PATH="/usr/X11R6/lib/pkgconfig"
 
 NO_REGRESS=	Yes
 
diff --git a/x11/sawfish/distinfo b/x11/sawfish/distinfo
index 571e7b391e7..2522a03ac2e 100644
--- a/x11/sawfish/distinfo
+++ b/x11/sawfish/distinfo
@@ -1,4 +1,4 @@
-MD5 (sawfish-0.36.tar.gz) = 489ec33d5e0bf99177eb52cea8dd7a30
-RMD160 (sawfish-0.36.tar.gz) = a7045fad943b3782c97cf0e26b10e6a612666ee7
-SHA1 (sawfish-0.36.tar.gz) = ef6c23b141e19cde9a1a462adb196ca0ebfec3f6
-SIZE (sawfish-0.36.tar.gz) = 1149036
+MD5 (sawfish-1.3.tar.gz) = 9e5ce5e76c60acecdb1889c1f173295a
+RMD160 (sawfish-1.3.tar.gz) = eef3b39bec21b4ede7a1af2fc9aa7714772d7d0c
+SHA1 (sawfish-1.3.tar.gz) = b631c7b110a09c3a26f071f7a68be7de99575a1c
+SIZE (sawfish-1.3.tar.gz) = 1582279
diff --git a/x11/sawfish/pkg/PFRAG.shared b/x11/sawfish/pkg/PFRAG.shared
index 065cb2d882e..80462072d22 100644
--- a/x11/sawfish/pkg/PFRAG.shared
+++ b/x11/sawfish/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.6 2005/05/23 20:29:45 marius Exp $
 libexec/rep/${GNU_ARCH}/sawfish/client.so
 libexec/sawfish/${VERSION}/${GNU_ARCH}/gradient.so
 libexec/sawfish/${VERSION}/${GNU_ARCH}/sawfish/wm/util/flippers.so
diff --git a/x11/sawfish/pkg/PLIST b/x11/sawfish/pkg/PLIST
index 8eced288164..0ba84a2f63d 100644
--- a/x11/sawfish/pkg/PLIST
+++ b/x11/sawfish/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/05/23 20:29:45 marius Exp $
+%%SHARED%%
 bin/sawfish
 bin/sawfish-client
 bin/sawfish-ui
@@ -39,7 +40,7 @@ share/locale/no/
 share/locale/no/LC_MESSAGES/
 share/locale/no/LC_MESSAGES/sawfish.mo
 share/pixmaps/
-share/pixmaps/sawfish.png
+share/pixmaps/sawfish-logo.png
 share/sawfish/
 share/sawfish/${VERSION}/
 share/sawfish/${VERSION}/lisp/
@@ -130,6 +131,8 @@ share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/pair.jl
 share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/pair.jlc
 share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/program.jl
 share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/program.jlc
+share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/scheme-boolean.jl
+share/sawfish/${VERSION}/lisp/sawfish/gtk/widgets/scheme-boolean.jlc
 share/sawfish/${VERSION}/lisp/sawfish/ui/
 share/sawfish/${VERSION}/lisp/sawfish/ui/apply.jl
 share/sawfish/${VERSION}/lisp/sawfish/ui/apply.jlc
@@ -150,8 +153,6 @@ share/sawfish/${VERSION}/lisp/sawfish/ui/shell.jl
 share/sawfish/${VERSION}/lisp/sawfish/ui/shell.jlc
 share/sawfish/${VERSION}/lisp/sawfish/ui/slot.jl
 share/sawfish/${VERSION}/lisp/sawfish/ui/slot.jlc
-share/sawfish/${VERSION}/lisp/sawfish/ui/user-level.jl
-share/sawfish/${VERSION}/lisp/sawfish/ui/user-level.jlc
 share/sawfish/${VERSION}/lisp/sawfish/ui/widgets/
 share/sawfish/${VERSION}/lisp/sawfish/ui/widgets/command.jl
 share/sawfish/${VERSION}/lisp/sawfish/ui/widgets/command.jlc
@@ -246,6 +247,8 @@ share/sawfish/${VERSION}/lisp/sawfish/wm/ext/tooltips.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/ext/tooltips.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/ext/window-history.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/ext/window-history.jlc
+share/sawfish/${VERSION}/lisp/sawfish/wm/ext/workspace-grid.jl
+share/sawfish/${VERSION}/lisp/sawfish/wm/ext/workspace-grid.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/focus.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/focus.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/frames.jl
@@ -328,10 +331,14 @@ share/sawfish/${VERSION}/lisp/sawfish/wm/util/display-wininfo.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/display-wininfo.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/edges.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/edges.jlc
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/font.jl
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/font.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/groups.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/groups.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/gtkrc.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/gtkrc.jlc
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/keymap-diff.jl
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/keymap-diff.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/keymap.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/keymap.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/nokogiri.jl
@@ -358,6 +365,8 @@ share/sawfish/${VERSION}/lisp/sawfish/wm/util/window-outline.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/window-outline.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/with-output.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/util/with-output.jlc
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/workarea.jl
+share/sawfish/${VERSION}/lisp/sawfish/wm/util/workarea.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/viewport.jl
 share/sawfish/${VERSION}/lisp/sawfish/wm/viewport.jlc
 share/sawfish/${VERSION}/lisp/sawfish/wm/window-anim.jl
@@ -396,6 +405,7 @@ share/sawfish/${VERSION}/sounds/toggled.wav
 share/sawfish/${VERSION}/themes/
 share/sawfish/${VERSION}/themes/Crux/
 share/sawfish/${VERSION}/themes/Crux/README
+share/sawfish/${VERSION}/themes/Crux/README.gl
 share/sawfish/${VERSION}/themes/Crux/active:bottom-left-border.png
 share/sawfish/${VERSION}/themes/Crux/active:bottom-left-corner.png
 share/sawfish/${VERSION}/themes/Crux/active:bottom-right-border.png
@@ -615,4 +625,3 @@ share/sawfish/${VERSION}/themes/smaker/min_inv.png
 share/sawfish/${VERSION}/themes/smaker/theme.jl
 share/sawfish/sounds/
 share/sawfish/themes/
-%%SHARED%%