diff --git a/x11/awesome/Makefile b/x11/awesome/Makefile
new file mode 100644
index 00000000000..d778bc02327
--- /dev/null
+++ b/x11/awesome/Makefile
@@ -0,0 +1,47 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/09/26 19:13:35 merdely Exp $
+
+COMMENT=		fast, small, dynamic and awesome window manager
+
+V=1.1
+DISTNAME=		awesome-${V}
+
+CATEGORIES=		x11
+
+HOMEPAGE=		http://awesome.naquadah.org/
+
+MAINTAINER=		Will Maier <willmaier@ml1.net>
+
+# BSD
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=		X11 Xext Xinerama Xrandr c
+
+MASTER_SITES=		${HOMEPAGE}/download/
+
+LIB_DEPENDS=		config::devel/libconfig
+
+CFLAGS+=                -I. -I${X11BASE}/include -I${PREFIX}/include -DVERSION=\\\"$V\\\" \
+			$$(pkg-config --cflags libconfig)
+LDFLAGS+=               -L${X11BASE}/lib -L${PREFIX}/lib -lX11 -lXext -lXrandr -lXinerama \
+			$$(pkg-config --libs libconfig)
+MAKE_FLAGS=             CC=${CC} CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+FAKE_FLAGS=             MANPREFIX=${PREFIX}/man \
+			PREFIX=${PREFIX}
+
+USE_X11=		Yes
+
+NO_REGRESS=		Yes
+
+post-patch:
+	@perl -pi -e 's|Mod4|Mod1|g' ${WRKSRC}/awesomerc
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/awesome/
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/awesome/
+	${INSTALL_DATA} ${WRKSRC}/awesomerc ${PREFIX}/share/examples/awesome/
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/awesome/
+
+.include <bsd.port.mk>
diff --git a/x11/awesome/distinfo b/x11/awesome/distinfo
new file mode 100644
index 00000000000..f5843a3eb56
--- /dev/null
+++ b/x11/awesome/distinfo
@@ -0,0 +1,5 @@
+MD5 (awesome-1.1.tar.gz) = appcJWtRaZpmBrOg1ufrCA==
+RMD160 (awesome-1.1.tar.gz) = CV8dWpYScWg2Dia+NVae9MlwEvU=
+SHA1 (awesome-1.1.tar.gz) = 0qXDrHVdw2QZujMVwRzDwKC9XGA=
+SHA256 (awesome-1.1.tar.gz) = 55n+XUSuTYs6c1qsPUEXDzHnU3u233qwd1ClDCSW4BI=
+SIZE (awesome-1.1.tar.gz) = 36864
diff --git a/x11/awesome/pkg/DESCR b/x11/awesome/pkg/DESCR
new file mode 100644
index 00000000000..705f465c7e4
--- /dev/null
+++ b/x11/awesome/pkg/DESCR
@@ -0,0 +1,7 @@
+awesome is a window manager initially based on a dwm code rewriting.
+It's extremely fast, small, dynamic and awesome.
+
+It manages windows in several layouts mode: tiled, floating, etc.  Each
+layout can be applied dynamically, optimizing the environment for the
+application in use and the task performed. Every aspect of awesome is
+configurable via a configuration file: awesomerc.
diff --git a/x11/awesome/pkg/MESSAGE b/x11/awesome/pkg/MESSAGE
new file mode 100644
index 00000000000..bcb636e45b5
--- /dev/null
+++ b/x11/awesome/pkg/MESSAGE
@@ -0,0 +1,3 @@
+Before running awesome, you'll need to create a configuration file. Copy
+the provided ${PREFIX}/share/examples/awesome/awesomerc to ~/.awesomerc
+and modify as necessary.
diff --git a/x11/awesome/pkg/PLIST b/x11/awesome/pkg/PLIST
new file mode 100644
index 00000000000..40dd28af1cb
--- /dev/null
+++ b/x11/awesome/pkg/PLIST
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/26 19:13:35 merdely Exp $
+bin/awesome
+@man man/man1/awesome.1
+share/doc/awesome/
+share/doc/awesome/README
+share/examples/awesome/
+share/examples/awesome/awesomerc