diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile
index a48e5bb52e8..8a780044e59 100644
--- a/x11/awesome/Makefile
+++ b/x11/awesome/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.28 2011/01/15 22:20:32 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.29 2011/01/17 13:23:06 dcoppa Exp $
 
 COMMENT=		fast, small, dynamic and awesome window manager
 
-DISTNAME=		awesome-3.4.8
-REVISION=		5
+DISTNAME=		awesome-3.4.9
 EXTRACT_SUFX=		.tar.bz2
 CATEGORIES=		x11
 
@@ -17,16 +16,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB+=		Imlib2 X11 Xau Xdmcp Xext Xrender c cairo
-WANTLIB+=		dbus-1 ev execinfo expat fontconfig freetype
-WANTLIB+=		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB+=		iconv intl lua m pango-1.0 pangocairo-1.0
-WANTLIB+=		pangoft2-1.0 pixman-1 png pthread pthread-stubs
-WANTLIB+=		startup-notification-1 xcb xcb-atom xcb-aux
-WANTLIB+=		xcb-event xcb-icccm xcb-image xcb-keysyms
-WANTLIB+=		xcb-property xcb-randr xcb-render xcb-render-util
-WANTLIB+=		xcb-shape xcb-shm xcb-xinerama xcb-xtest
-WANTLIB+=		xdg-basedir z
+WANTLIB+=		GL Imlib2 X11 Xau Xdamage Xdmcp Xext Xfixes
+WANTLIB+=		Xrender Xxf86vm c cairo dbus-1 drm ev
+WANTLIB+=		execinfo expat fontconfig freetype glib-2.0
+WANTLIB+=		gmodule-2.0 gobject-2.0 gthread-2.0 iconv
+WANTLIB+=		intl lua m pango-1.0 pangocairo-1.0
+WANTLIB+=		pangoft2-1.0 pixman-1 png pthread
+WANTLIB+=		pthread-stubs startup-notification-1 xcb
+WANTLIB+=		xcb-atom xcb-aux xcb-event xcb-icccm
+WANTLIB+=		xcb-image xcb-keysyms xcb-property
+WANTLIB+=		xcb-randr xcb-render xcb-shape xcb-shm
+WANTLIB+=		xcb-xinerama xcb-xtest xdg-basedir z
 
 MASTER_SITES=		${HOMEPAGE}download/
 
diff --git a/x11/awesome/distinfo b/x11/awesome/distinfo
index ca667f0a689..9143befe458 100644
--- a/x11/awesome/distinfo
+++ b/x11/awesome/distinfo
@@ -1,5 +1,5 @@
-MD5 (awesome-3.4.8.tar.bz2) = R/4kEfi7Z38FUcBiO8SeRA==
-RMD160 (awesome-3.4.8.tar.bz2) = +XwxYx6BwAO3/JDlgtfYvK5AmB8=
-SHA1 (awesome-3.4.8.tar.bz2) = I3SLzNi9SZkQc1SiQXOBHL3IV0A=
-SHA256 (awesome-3.4.8.tar.bz2) = RXtjl3kFOijTmgA5zcLXbmsa41iysNNEZ6BadelZ/2Y=
-SIZE (awesome-3.4.8.tar.bz2) = 741506
+MD5 (awesome-3.4.9.tar.bz2) = o+jyL7TRfdHNqQs1S+hNbw==
+RMD160 (awesome-3.4.9.tar.bz2) = q2y4H5xEyi0++GPTdoOTCiH7nFg=
+SHA1 (awesome-3.4.9.tar.bz2) = j7pL8uJywhz51/XyJpkyqWf6czw=
+SHA256 (awesome-3.4.9.tar.bz2) = FEz5ZDykfCI4mB+f4KHIrjee9UpfuFP9msNUGmD8c40=
+SIZE (awesome-3.4.9.tar.bz2) = 742902
diff --git a/x11/awesome/patches/patch-awesomeConfig_cmake b/x11/awesome/patches/patch-awesomeConfig_cmake
index 55036555757..246120ae0e4 100644
--- a/x11/awesome/patches/patch-awesomeConfig_cmake
+++ b/x11/awesome/patches/patch-awesomeConfig_cmake
@@ -1,8 +1,8 @@
-$OpenBSD: patch-awesomeConfig_cmake,v 1.3 2010/09/14 08:51:24 dcoppa Exp $
---- awesomeConfig.cmake.orig	Wed Aug 25 10:50:48 2010
-+++ awesomeConfig.cmake	Fri Sep 10 13:47:47 2010
-@@ -18,11 +18,11 @@ option(GENERATE_LUADOC "generate luadoc" ON)
- link_directories(/usr/local/lib)
+$OpenBSD: patch-awesomeConfig_cmake,v 1.4 2011/01/17 13:23:06 dcoppa Exp $
+--- awesomeConfig.cmake.orig	Mon Jan 17 12:38:13 2011
++++ awesomeConfig.cmake	Mon Jan 17 13:07:59 2011
+@@ -16,11 +16,11 @@ option(COMPRESS_MANPAGES "compress manpages" ON)
+ option(GENERATE_LUADOC "generate luadoc" ON)
  
  # {{{ CFLAGS
 -add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall -Wextra
@@ -10,7 +10,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.3 2010/09/14 08:51:24 dcoppa Exp $
 -    -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized -Winit-self
 -    -Wpointer-arith -Wredundant-decls -Wformat-nonliteral
 -    -Wno-format-zero-length -Wmissing-format-attribute -Wmissing-prototypes
-+add_definitions(-std=gnu99 -ggdb3 -fno-strict-aliasing -Wall
++add_definitions(-std=gnu99 -fgnu89-inline -fno-strict-aliasing
 +    -Wchar-subscripts -Wcast-align -Wwrite-strings
 +    -Wsign-compare -Wunused -Wno-unused-parameter -Wuninitialized
 +    -Wpointer-arith -Wformat-nonliteral -Wno-format-zero-length
@@ -18,25 +18,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.3 2010/09/14 08:51:24 dcoppa Exp $
      -Wstrict-prototypes)
  # }}}
  
-@@ -166,6 +166,9 @@ endmacro()
- # Check for libev
- a_find_library(LIB_EV ev)
- 
-+# Check for libexecinfo on non Glibc systems
-+a_find_library(LIB_EXECINFO execinfo)
-+
- # Error check
- if(NOT LUA51_FOUND AND NOT LUA50_FOUND) # This is a workaround to a cmake bug
-     message(FATAL_ERROR "lua library not found")
-@@ -175,6 +178,7 @@ set(AWESOME_REQUIRED_LIBRARIES
-     ${AWESOME_COMMON_REQUIRED_LDFLAGS}
-     ${AWESOME_REQUIRED_LIBRARIES}
-     ${LIB_EV}
-+    ${LIB_EXECINFO}
-     ${LUA_LIBRARIES})
- 
- set(AWESOME_REQUIRED_INCLUDE_DIRS
-@@ -214,7 +218,7 @@ endif()
+@@ -240,7 +240,7 @@ endif()
  if(DEFINED SYSCONFDIR)
      set(SYSCONFDIR ${SYSCONFDIR} CACHE PATH "config directory")
  else()
@@ -45,7 +27,7 @@ $OpenBSD: patch-awesomeConfig_cmake,v 1.3 2010/09/14 08:51:24 dcoppa Exp $
  endif()
  
  #If an XDG Config Dir is specificed, use it instead
-@@ -243,7 +247,7 @@ endif()
+@@ -269,7 +269,7 @@ endif()
  if(DEFINED AWESOME_MAN_PATH)
     set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory")
  else()
diff --git a/x11/awesome/patches/patch-dbus_c b/x11/awesome/patches/patch-dbus_c
deleted file mode 100644
index 6450926f02b..00000000000
--- a/x11/awesome/patches/patch-dbus_c
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-dbus_c,v 1.1 2010/06/02 15:07:50 dcoppa Exp $
---- dbus.c.orig	Tue Mar  2 16:54:05 2010
-+++ dbus.c	Mon May 10 10:46:57 2010
-@@ -71,6 +71,7 @@ static int
- a_dbus_message_iter(DBusMessageIter *iter)
- {
-     int nargs = 0;
-+    int datalen = 0;
- 
-     do
-     {
-@@ -130,7 +131,6 @@ a_dbus_message_iter(DBusMessageIter *iter)
- 
-                     switch(array_type)
-                     {
--                      int datalen = 0;
- #define DBUS_MSG_HANDLE_ARRAY_TYPE_NUMBER(type, dbustype) \
-                       case dbustype: \
-                         { \
diff --git a/x11/awesome/patches/patch-globalconf_h b/x11/awesome/patches/patch-globalconf_h
deleted file mode 100644
index 444b086fc91..00000000000
--- a/x11/awesome/patches/patch-globalconf_h
+++ /dev/null
@@ -1,31 +0,0 @@
-$OpenBSD: patch-globalconf_h,v 1.2 2010/09/14 08:51:24 dcoppa Exp $
---- globalconf.h.orig	Wed Aug 25 10:50:48 2010
-+++ globalconf.h	Fri Sep 10 13:47:48 2010
-@@ -137,5 +137,27 @@ typedef struct
- 
- extern awesome_t globalconf;
- 
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-+#define ALWAYS_INLINE __attribute__((always_inline)) inline
-+#else
-+#define ALWAYS_INLINE inline
-+#endif
-+
-+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 3)
-+#define awesome_clz(x) __builtin_clz(x)
-+#else
-+static int ALWAYS_INLINE awesome_clz( uint32_t x )
-+{
-+    static uint8_t lut[16] = {4,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0};
-+    int y, z = (((x >> 16) - 1) >> 27) & 16;
-+    x >>= z^16;
-+    z += y = ((x - 0x100) >> 28) & 8;
-+    x >>= y^8;
-+    z += y = ((x - 0x10) >> 29) & 4;
-+    x >>= y^4;
-+    return z + lut[x];
-+}
-+#endif
-+
- #endif
- // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/x11/awesome/patches/patch-key_c b/x11/awesome/patches/patch-key_c
deleted file mode 100644
index 93c8750e028..00000000000
--- a/x11/awesome/patches/patch-key_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-key_c,v 1.1 2010/06/02 15:07:50 dcoppa Exp $
---- key.c.orig	Tue Mar  2 16:54:05 2010
-+++ key.c	Mon May 10 10:46:57 2010
-@@ -351,7 +351,7 @@ static int8_t const __utf32_clz_to_len[32] = {
-     2, 2, 2, 2,         /* 0x00000080 */
-     1, 1, 1, 1, 1, 1, 1 /* 0x00000001 */
- };
--#define utf8clen(c) __utf32_clz_to_len[__builtin_clz((uint32_t)(c) | 1)]
-+#define utf8clen(c) __utf32_clz_to_len[awesome_clz((uint32_t)(c) | 1)]
- 
- static bool
- keysym_to_utf8(char *buf, const xcb_keysym_t ksym)