diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index cfb2dfa152f..f2865fc4f23 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2007/09/15 20:04:19 merdely Exp $
+# $OpenBSD: Makefile,v 1.30 2008/11/21 15:13:58 jasper Exp $
 
 COMMENT=	Window manager, continuation of the Bowman NeXTSTEP clone
 
 DISTNAME=	AfterStep-1.8.9
-PKGNAME=	${DISTNAME:L}
+PKGNAME=	${DISTNAME:L}p0
 CATEGORIES=     x11
 MASTER_SITES=   ftp://ftp.afterstep.org/stable/
 
diff --git a/x11/afterstep/patches/patch-lib_asproperty_c b/x11/afterstep/patches/patch-lib_asproperty_c
new file mode 100644
index 00000000000..f2d727b7f3b
--- /dev/null
+++ b/x11/afterstep/patches/patch-lib_asproperty_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-lib_asproperty_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
+--- lib/asproperty.c.orig	Fri Nov 21 13:39:34 2008
++++ lib/asproperty.c	Fri Nov 21 13:39:49 2008
+@@ -21,6 +21,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <X11/X.h>
+ #include <X11/Xatom.h>
+ 
diff --git a/x11/afterstep/patches/patch-lib_wild_c b/x11/afterstep/patches/patch-lib_wild_c
new file mode 100644
index 00000000000..756d87a9061
--- /dev/null
+++ b/x11/afterstep/patches/patch-lib_wild_c
@@ -0,0 +1,9 @@
+$OpenBSD: patch-lib_wild_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
+--- lib/wild.c.orig	Fri Nov 21 13:37:53 2008
++++ lib/wild.c	Fri Nov 21 13:39:21 2008
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include "../configure.h"
+ #include "../include/aftersteplib.h"
diff --git a/x11/afterstep/patches/patch-src_WinList_List_c b/x11/afterstep/patches/patch-src_WinList_List_c
new file mode 100644
index 00000000000..47709028aa1
--- /dev/null
+++ b/x11/afterstep/patches/patch-src_WinList_List_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_WinList_List_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
+--- src/WinList/List.c.orig	Fri Nov 21 13:45:15 2008
++++ src/WinList/List.c	Fri Nov 21 13:45:24 2008
+@@ -23,6 +23,7 @@
+ #include "../../configure.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "List.h"
+ #include "../../include/aftersteplib.h"
+ #include "../../include/module.h"
diff --git a/x11/afterstep/patches/patch-src_afterstep_resize_c b/x11/afterstep/patches/patch-src_afterstep_resize_c
new file mode 100644
index 00000000000..c9b3e68837b
--- /dev/null
+++ b/x11/afterstep/patches/patch-src_afterstep_resize_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-src_afterstep_resize_c,v 1.1 2008/11/21 15:13:58 jasper Exp $
+--- src/afterstep/resize.c.orig	Fri Nov 21 13:40:36 2008
++++ src/afterstep/resize.c	Fri Nov 21 13:40:58 2008
+@@ -37,6 +37,7 @@
+ #include "../../configure.h"
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
diff --git a/x11/afterstep/pkg/PLIST b/x11/afterstep/pkg/PLIST
index 7904505595c..1b146038a6a 100644
--- a/x11/afterstep/pkg/PLIST
+++ b/x11/afterstep/pkg/PLIST
@@ -1,25 +1,25 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:26:27 espie Exp $
-bin/ASSound
-bin/Animate
-bin/Audio
-bin/Banner
-bin/Cascade
-bin/Clean
-bin/Form
-bin/Gnome
-bin/Ident
-bin/Pager
-bin/Save
-bin/Script
-bin/Scroll
-bin/Tile
-bin/Wharf
-bin/WinList
-bin/Zharf
-bin/afterstep
+@comment $OpenBSD: PLIST,v 1.7 2008/11/21 15:13:58 jasper Exp $
+@bin bin/ASSound
+@bin bin/Animate
+@bin bin/Audio
+@bin bin/Banner
+@bin bin/Cascade
+@bin bin/Clean
+@bin bin/Form
+@bin bin/Gnome
+@bin bin/Ident
+@bin bin/Pager
+@bin bin/Save
+@bin bin/Script
+@bin bin/Scroll
+@bin bin/Tile
+@bin bin/Wharf
+@bin bin/WinList
+@bin bin/Zharf
+@bin bin/afterstep
 bin/afterstepdoc
 bin/ascommand.pl
-bin/asetroot
+@bin bin/asetroot
 bin/importasmenu
 bin/installastheme.pl
 bin/makeastheme.pl