diff --git a/x11-wm/dwm/Makefile b/x11-wm/dwm/Makefile
index 6f9f323bad34..2bc12cfd0326 100644
--- a/x11-wm/dwm/Makefile
+++ b/x11-wm/dwm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dwm
-PORTVERSION=	4.9
+PORTVERSION=	5.0.1
 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_XORG=	x11
+USE_XORG=	x11 xinerama
 
 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.9 config.h-files no longer work."
+	@${ECHO_MSG} "Note: Pre-5.0 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 dfb7e9ccb1e8..2042e2f7cd1e 100644
--- a/x11-wm/dwm/distinfo
+++ b/x11-wm/dwm/distinfo
@@ -1,3 +1,3 @@
-MD5 (dwm-4.9.tar.gz) = cf72c6a72e6c35c132b5db4faf3fb358
-SHA256 (dwm-4.9.tar.gz) = 3f4f595e7845cedce1696668adf0a8ade2fc8a72d4c32d53de35a7c5d900790d
-SIZE (dwm-4.9.tar.gz) = 18132
+MD5 (dwm-5.0.1.tar.gz) = 27d91d886c9ba1aad4b09178e2653ee0
+SHA256 (dwm-5.0.1.tar.gz) = f39e2b62d75b79489c535dc3cfcd6ea2b9c412857448519f29a4eed7af2f33a3
+SIZE (dwm-5.0.1.tar.gz) = 17954
diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk
index c890eb9f59ad..cc884a0374e9 100644
--- a/x11-wm/dwm/files/patch-config.mk
+++ b/x11-wm/dwm/files/patch-config.mk
@@ -1,6 +1,6 @@
---- config.mk.orig	2008-04-03 22:57:01.000000000 +0200
-+++ config.mk	2008-04-04 12:05:19.000000000 +0200
-@@ -4,19 +4,19 @@
+--- config.mk.orig	2008-06-18 23:08:29.000000000 +0200
++++ config.mk	2008-06-20 10:39:37.000000000 +0200
+@@ -4,11 +4,11 @@
  # Customize below to fit your system
  
  # paths
@@ -14,21 +14,18 @@
 +X11INC = $(LOCALBASE)/include
 +X11LIB = $(LOCALBASE)/lib
  
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
- LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama
+@@ -19,9 +19,9 @@
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
  
  # flags
--CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+-CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS = -s ${LIBS}
-+CFLAGS+= ${INCS} -DVERSION=\"${VERSION}\"
++CPPFLAGS+= -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
++CFLAGS+= ${INCS} ${CPPFLAGS}
 +LDFLAGS+= ${LIBS}
- #CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
- #LDFLAGS = -g ${LIBS}
  
-@@ -25,4 +25,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+CC?= cc
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"