diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index d56705b21e66..999b4d0fc3b3 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dwm
-PORTVERSION=	4.7
+PORTVERSION=	4.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/ \
 		http://schot.a-eskwadraat.nl/files/
@@ -16,7 +16,7 @@ COMMENT=	A dynamic, small, fast and simple window manager
 
 RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu
 
-USE_XLIB=	yes
+USE_XORG=	x11
 
 MAN1=		dwm.1
 PLIST_FILES=	bin/dwm
@@ -25,7 +25,7 @@ PORTDOCS=	LICENSE README
 pre-everything::
 	@${ECHO_MSG} "You can build dwm with your own config.h using the DWM_CONF knob:"
 	@${ECHO_MSG} "make DWM_CONF=/path/to/dwm/config.h install clean"
-	@${ECHO_MSG} "Note: Pre-4.7 config.h-files no longer work."
+	@${ECHO_MSG} "Note: Pre-4.8 config.h-files no longer work."
 
 post-extract:
 .if defined(DWM_CONF)
diff --git a/x11-wm/dwm/distinfo b/x11-wm/dwm/distinfo
index 65c4a876a66a..26500408cfca 100644
--- a/x11-wm/dwm/distinfo
+++ b/x11-wm/dwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (dwm-4.7.tar.gz) = 827b128514a3edb87e208e84fee0eb3f
-SHA256 (dwm-4.7.tar.gz) = 37481957fc247f6860ba5942748f8f89b526bf5b8b21042001d384e88360c5aa
-SIZE (dwm-4.7.tar.gz) = 17693
+MD5 (dwm-4.8.tar.gz) = 75f49997c4af45707688f764f604c119
+SHA256 (dwm-4.8.tar.gz) = 431b6767e090d4b80b42e2adff6a6a5c7d344c6e22e93e0dd022dcec2b9e2118
+SIZE (dwm-4.8.tar.gz) = 17879
diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk
index b27e667c6148..0755947e72a5 100644
--- a/x11-wm/dwm/files/patch-config.mk
+++ b/x11-wm/dwm/files/patch-config.mk
@@ -1,5 +1,5 @@
---- config.mk.orig	2007-11-21 21:18:41.000000000 +0100
-+++ config.mk	2007-11-22 16:49:20.000000000 +0100
+--- config.mk.orig	2008-03-13 17:55:43.000000000 +0100
++++ config.mk	2008-03-13 21:43:27.000000000 +0100
 @@ -4,19 +4,19 @@
  # Customize below to fit your system
  
@@ -23,7 +23,7 @@
 -LDFLAGS = -s ${LIBS}
 +CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
 +LDFLAGS+= ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
+ #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\" -DWORK
  #LDFLAGS = -g ${LIBS}
  
 @@ -26,4 +26,4 @@