diff --git a/srcpkgs/yeahwm/patches/fix-makefile.patch b/srcpkgs/yeahwm/patches/fix-makefile.patch
new file mode 100644
index 00000000000..d6a05ceef17
--- /dev/null
+++ b/srcpkgs/yeahwm/patches/fix-makefile.patch
@@ -0,0 +1,38 @@
+Enable configurable CC and XROOT.
+Add missing $(LIBS) to link and remove strip.
+Add yeahwm.1 to install target.
+
+--- Makefile	2004-11-21 19:11:04.000000000 +0100
++++ Makefile	2015-10-25 23:20:45.306617941 +0100
+@@ -1,11 +1,11 @@
+ # If you don't use CC 
+-CC       = gcc
++CC       ?= gcc
+ 
+ # Edit this line if you don't want yeahwm to install under /usr.
+ # Note that $(DESTDIR) is used by the Debian build process.
+ prefix = $(DESTDIR)/usr
+ 
+-XROOT    = /usr/X11R6
++XROOT    ?= /usr/X11R6
+ INCLUDES = -I$(XROOT)/include
+ LDPATH   = -L$(XROOT)/lib
+ LIBS     = -lX11
+@@ -55,7 +55,6 @@
+ all: yeahwm
+ 
+ yeahwm: $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
++	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS) $(LIBS)
+- 	strip yeahwm
+ 
+ allinone:
+@@ -71,7 +71,7 @@
+ 	if [ -f yeahwm.exe ]; then mv yeahwm.exe yeahwm; fi
+ 	mkdir -p $(prefix)/bin $(prefix)/share/man/man1
+ 	install -s yeahwm $(prefix)/bin
+-	#install yeahwm.1 $(prefix)/share/man/man1
++	install yeahwm.1 $(prefix)/share/man/man1
+ 	#gzip -9 $(prefix)/share/man/man1/yeahwm.1
+ 
+ install: doinstall
diff --git a/srcpkgs/yeahwm/patches/fix-shape.patch b/srcpkgs/yeahwm/patches/fix-shape.patch
new file mode 100644
index 00000000000..d462cce5598
--- /dev/null
+++ b/srcpkgs/yeahwm/patches/fix-shape.patch
@@ -0,0 +1,20 @@
+Fix misplaced #ifdef. A closing brace is always required
+for switch() and an empty default is a bug.
+
+--- main.c	2004-11-21 19:00:54.000000000 +0100
++++ main.c	2015-10-25 23:08:33.060565151 +0100
+@@ -173,12 +173,12 @@
+             if (ev.xexpose.count == 0);
+             handle_expose_event(&ev.xexpose);
+             break;
+-        default:
+ #ifdef SHAPE
++        default:
+             if (have_shape && ev.type == shape_event)
+                 handle_shape_event((XShapeEvent *) & ev);
+-        }
+ #endif
++        }
+ 
+     }
+     return 1;
diff --git a/srcpkgs/yeahwm/template b/srcpkgs/yeahwm/template
new file mode 100644
index 00000000000..4f12ccfbb83
--- /dev/null
+++ b/srcpkgs/yeahwm/template
@@ -0,0 +1,21 @@
+# Template build file for 'yeahwm'.
+pkgname=yeahwm
+version=0.3.5
+revision=1
+build_style=gnu-makefile
+make_build_args="XROOT=\${XBPS_CROSS_BASE}/usr"
+build_pie=yes
+makedepends="lesstif-devel libX11-devel libXinerama-devel"
+short_desc="A h* window manager for X based on evilwm and aewm"
+maintainer="Ananteris <ananteris@mailinator.com>"
+homepage="http://phrat.de"
+distfiles="http://phrat.de/${pkgname}_${version}.tar.gz"
+checksum=c92ce98848c8b88d9b67c128e30710944c04a6454310254535c102b2b6fcee05
+license="Public Domain"
+
+post_install() {
+	tail -n 40 README.evilwm > LICENSE
+	vlicense LICENSE
+	vdoc README
+	vdoc README.evilwm
+}