diff --git a/x11/scrotwm/Makefile b/x11/scrotwm/Makefile
index 9fd63e97635..c62c1d49d13 100644
--- a/x11/scrotwm/Makefile
+++ b/x11/scrotwm/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2009/09/25 19:26:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2009/09/30 00:54:06 sthen Exp $
 
 COMMENT=		small tiling window manager
 
-DISTNAME=		scrotwm-0.9.7
+SHARED_LIBS=		swmhack 0.0
+
+DISTNAME=		scrotwm-0.9.8
 EXTRACT_SUFX=		.tgz
 CATEGORIES=		x11
 
@@ -23,7 +25,9 @@ WANTLIB=        c X11 Xrandr util
 RUN_DEPENDS=	:dmenu->=3.9:x11/dmenu
 		
 MAKE_FLAGS=	BINDIR="${TRUEPREFIX}/bin" \
-		MANDIR="${TRUEPREFIX}/man/cat"
+		MANDIR="${TRUEPREFIX}/man/cat" \
+		SHLIB_MAJOR=${LIBswmhack_VERSION:C/\..*//} \
+		SHLIB_MINOR=${LIBswmhack_VERSION:C/.*\.//}
 
 pre-configure:
 	@${SUBST_CMD} ${WRKSRC}/scrotwm.conf ${WRKSRC}/scrotwm.c
diff --git a/x11/scrotwm/distinfo b/x11/scrotwm/distinfo
index c7fa89a1bfa..24926872bd8 100644
--- a/x11/scrotwm/distinfo
+++ b/x11/scrotwm/distinfo
@@ -1,5 +1,5 @@
-MD5 (scrotwm-0.9.7.tgz) = RohMnwHQ7yJ+c8SbLv64Cw==
-RMD160 (scrotwm-0.9.7.tgz) = HtgaiHsnByZ7RHOY7UDb4HomO3A=
-SHA1 (scrotwm-0.9.7.tgz) = 90qjvvlvQbvugYTtMU0iWJ3nbOo=
-SHA256 (scrotwm-0.9.7.tgz) = ftC/sqvjjv99M2mnRedWFZdF+Gsk9HOOtI6gOwh61CQ=
-SIZE (scrotwm-0.9.7.tgz) = 38391
+MD5 (scrotwm-0.9.8.tgz) = YGhKg1vwJRZLFyeg2QXdpg==
+RMD160 (scrotwm-0.9.8.tgz) = N/de4GcK6TUb+JlIsyW8j1L9QP8=
+SHA1 (scrotwm-0.9.8.tgz) = dVH++mSLCHXnY128QwNvJYnttTg=
+SHA256 (scrotwm-0.9.8.tgz) = uLI4CktyhZMvKdsdQ+VZ/bpwS+6Eb4bgri+y2od5IEw=
+SIZE (scrotwm-0.9.8.tgz) = 38863
diff --git a/x11/scrotwm/patches/patch-lib_Makefile b/x11/scrotwm/patches/patch-lib_Makefile
deleted file mode 100644
index 06a59f84249..00000000000
--- a/x11/scrotwm/patches/patch-lib_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-lib_Makefile,v 1.1.1.1 2009/01/28 13:20:23 pyr Exp $
---- lib/Makefile.orig	Tue Jan 27 11:14:10 2009
-+++ lib/Makefile	Tue Jan 27 11:15:09 2009
-@@ -16,7 +16,7 @@ CFLAGS+= -I${X11BASE}/include
- install:
- 	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
- 		lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
--		${X11BASE}/lib/swmhack.so
-+		${PREFIX}/lib/swmhack.so
- 
- .include <bsd.lib.mk>
- .include <bsd.xorg.mk>
diff --git a/x11/scrotwm/patches/patch-scrotwm_c b/x11/scrotwm/patches/patch-scrotwm_c
index 12957dfc251..3883a4138d8 100644
--- a/x11/scrotwm/patches/patch-scrotwm_c
+++ b/x11/scrotwm/patches/patch-scrotwm_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-scrotwm_c,v 1.6 2009/09/25 19:26:30 sthen Exp $
+$OpenBSD: patch-scrotwm_c,v 1.7 2009/09/30 00:54:06 sthen Exp $
 --- scrotwm.c.orig	Wed Sep 23 06:04:09 2009
 +++ scrotwm.c	Fri Sep 25 17:28:03 2009
 @@ -146,7 +146,7 @@ u_int32_t		swm_debug = 0
  #define SWM_MAX_FONT_STEPS	(3)
  
  #ifndef SWM_LIB
--#define SWM_LIB			"/usr/local/lib/libswmhack.so.0.0"
-+#define SWM_LIB			"${PREFIX}/lib/libswmhack.so.0.0"
+-#define SWM_LIB			"/usr/local/lib/libswmhack.so"
++#define SWM_LIB			"${PREFIX}/lib/libswmhack.so"
  #endif
  
  char			**start_argv;
diff --git a/x11/scrotwm/pkg/PFRAG.shared b/x11/scrotwm/pkg/PFRAG.shared
index 97c5baef84b..963093b80a1 100644
--- a/x11/scrotwm/pkg/PFRAG.shared
+++ b/x11/scrotwm/pkg/PFRAG.shared
@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/01/28 13:20:23 pyr Exp $
-lib/swmhack.so
+@comment $OpenBSD: PFRAG.shared,v 1.2 2009/09/30 00:54:06 sthen Exp $
+@lib lib/libswmhack.so.${LIBswmhack_VERSION}