diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile
index 83c12e8c481..caaffced89c 100644
--- a/x11/awesome/Makefile
+++ b/x11/awesome/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2007/10/27 12:34:55 merdely Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/16 21:27:14 pyr Exp $
 
 COMMENT=		fast, small, dynamic and awesome window manager
 
-V=1.3
-DISTNAME=		awesome-${V}
+V=2.0
+DISTNAME=		awesome-$V
 
 CATEGORIES=		x11
 
@@ -21,14 +21,24 @@ WANTLIB=		X11 Xext Xinerama Xrandr Xft c
 
 MASTER_SITES=		${HOMEPAGE}/download/
 
-LIB_DEPENDS=		config::devel/libconfig
+LIB_DEPENDS=		cairo.>=6::graphics/cairo	\
+			confuse::devel/libconfuse
+BUILD_DEPENDS=		::textproc/asciidoc	\
+			::textproc/xmlto
 
-CFLAGS+=                -I. -I${X11BASE}/include -I${X11BASE}/include/freetype2 \
-			-I${LOCALBASE}/include -DVERSION=\\\"$V\\\" \
-			$$(pkg-config --cflags libconfig)
-LDFLAGS+=               -L${X11BASE}/lib -L${LOCALBASE}/lib \
+CFLAGS+=		-I. -I${X11BASE}/include \
+			-I${X11BASE}/include/freetype2 \
+			-I${LOCALBASE}/include \
+			$$(pkg-config --cflags libconfuse) \
+			$$(pkg-config --cflags cairo) \
+			-DVERSION=\\\"$V\\\" \
+			-DRELEASE=\\\"Fruit_Fly\\\"
+
+LDFLAGS+=		-L${X11BASE}/lib -L${LOCALBASE}/lib \
 			-lX11 -lXext -lXrandr -lXinerama -lXft \
-			$$(pkg-config --libs libconfig)
+			$$(pkg-config --libs libconfuse) \
+			$$(pkg-config --libs cairo)
+
 MAKE_FLAGS=             CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 FAKE_FLAGS=             MANPREFIX=${PREFIX}/man \
 			PREFIX=${PREFIX}
diff --git a/x11/awesome/distinfo b/x11/awesome/distinfo
index d14948d9001..afdd37cd46f 100644
--- a/x11/awesome/distinfo
+++ b/x11/awesome/distinfo
@@ -1,5 +1,5 @@
-MD5 (awesome-1.3.tar.gz) = xWJYU+X3ntfN5hi4cpKFJw==
-RMD160 (awesome-1.3.tar.gz) = tkCzOhONVwCc33VeMuqXT1L20wg=
-SHA1 (awesome-1.3.tar.gz) = yGVv2ghlLOwgIX+zaeSmx8zgUo0=
-SHA256 (awesome-1.3.tar.gz) = cvi22RB+jE1V7q2LE7cfRFmw1BXNZ/KVjIDtMoePljU=
-SIZE (awesome-1.3.tar.gz) = 40012
+MD5 (awesome-2.0.tar.gz) = s+JFvZuMBbdZzArL7J9qKQ==
+RMD160 (awesome-2.0.tar.gz) = OjpwFKEZFfMWv86c5aKmBqBXNjo=
+SHA1 (awesome-2.0.tar.gz) = ejJX56dvnXe9WVWKqDk/K+1QBX8=
+SHA256 (awesome-2.0.tar.gz) = kzzn9fQzmWOl9iKcr4LJ8PuOtp5pKT9yJGc34T/6oHk=
+SIZE (awesome-2.0.tar.gz) = 48600
diff --git a/x11/awesome/patches/patch-awesome-client-common_c b/x11/awesome/patches/patch-awesome-client-common_c
new file mode 100644
index 00000000000..df406145d59
--- /dev/null
+++ b/x11/awesome/patches/patch-awesome-client-common_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-awesome-client-common_c,v 1.1 2007/12/16 21:27:14 pyr Exp $
+--- awesome-client-common.c.orig	Sun Dec 16 15:48:35 2007
++++ awesome-client-common.c	Sun Dec 16 15:47:36 2007
+@@ -20,6 +20,7 @@
+  *
+  */
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ 
diff --git a/x11/awesome/pkg/PLIST b/x11/awesome/pkg/PLIST
index 40dd28af1cb..f68a8375530 100644
--- a/x11/awesome/pkg/PLIST
+++ b/x11/awesome/pkg/PLIST
@@ -1,5 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/26 19:13:35 merdely Exp $
+@comment $OpenBSD: PLIST,v 1.2 2007/12/16 21:27:14 pyr Exp $
 bin/awesome
+bin/awesome-client
+@man man/man1/awesome-client.1
 @man man/man1/awesome.1
 share/doc/awesome/
 share/doc/awesome/README