diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index aa6f27bad199..28e7361816a2 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -119,5 +119,6 @@
     SUBDIR += xfce4-panel-profiles
     SUBDIR += xfce4-session
     SUBDIR += xfce4-wm
+    SUBDIR += yeahwm
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-wm/yeahwm/Makefile b/x11-wm/yeahwm/Makefile
new file mode 100644
index 000000000000..1df446314141
--- /dev/null
+++ b/x11-wm/yeahwm/Makefile
@@ -0,0 +1,42 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	yeahwm
+PORTVERSION=	0.3.5
+CATEGORIES=	x11-wm
+MASTER_SITES=	http://phrat.de/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Minimal X11 window manager with BeOS-like tabbed titles
+
+USES=		xorg
+USE_XORG=	x11 xext xinerama
+MAKE_ARGS=	CC="${CC}" XROOT="${LOCALBASE}"
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+PLIST_FILES=	bin/yeahwm man/man1/yeahwm.1.gz
+PORTDOCS=	README*
+
+OPTIONS_DEFINE=	DOCS MOTIF
+MOTIF_DESC=	Use Motif hints to find if window should be borderless
+
+MOTIF_BUILD_DEPENDS=	${LOCALBASE}/include/Xm/MwmUtil.h:x11-toolkits/open-motif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's, -Wall  -Os,-fcommon,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/DEF_FONT/s,variable,fixed,' ${WRKSRC}/config.h
+
+post-patch-MOTIF-off:
+	@${REINPLACE_CMD} -e '/MWM_HINTS/s,define,undef,' ${WRKSRC}/config.h
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/yeahwm ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/yeahwm.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/x11-wm/yeahwm/distinfo b/x11-wm/yeahwm/distinfo
new file mode 100644
index 000000000000..1fc0b43a2432
--- /dev/null
+++ b/x11-wm/yeahwm/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1101403672
+SHA256 (yeahwm_0.3.5.tar.gz) = c92ce98848c8b88d9b67c128e30710944c04a6454310254535c102b2b6fcee05
+SIZE (yeahwm_0.3.5.tar.gz) = 23465
diff --git a/x11-wm/yeahwm/pkg-descr b/x11-wm/yeahwm/pkg-descr
new file mode 100644
index 000000000000..a980c29b94d4
--- /dev/null
+++ b/x11-wm/yeahwm/pkg-descr
@@ -0,0 +1,18 @@
+YeahWM is a minimalist window manager for X11 based on evilwm and aewm.
+It features:
+
+  * Sloppy focus
+  * BeOS-like tabbed titles, which can be repositioned
+  * Support for Xinerama
+  * Simple appearance
+  * Good keyboard control
+  * Creative usage of the mouse
+  * Respects aspect size hints
+  * Solid resize and move operations
+  * Virtual desktops
+  * "Magic" screen edges for desktop switching
+  * Snapping to other windows and screen borders when moving windows
+  * Small binary size (ca. 23KB)
+  * Little resource usage
+
+WWW: http://phrat.de/