diff --git a/srcpkgs/artwiz-fonts/template b/srcpkgs/artwiz-fonts/template
new file mode 100644
index 0000000000..b3f91a869f
--- /dev/null
+++ b/srcpkgs/artwiz-fonts/template
@@ -0,0 +1,28 @@
+# Template file for 'artwiz-fonts'
+pkgname=artwiz-fonts
+version=1.3
+revision=1
+short_desc="Small futuristic ASCII fonts for X"
+maintainer="Ypnose <linuxienATlegtuxDOTorg>"
+homepage="http://artwizaleczapka.sourceforge.net/"
+license="GPL-2"
+distfiles="http://downloads.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${version}.tar.bz2"
+checksum=19f163de81548db9b9dd7d3a415fba379f1d17989020236aa4eb88c25929afe1
+makedepends="font-util mkfontdir"
+
+do_install() {
+	vmkdir usr/share/fonts/artwiz-fonts
+	install -m644 *.pcf  ${DESTDIR}/usr/share/fonts/artwiz-fonts
+
+	vinstall fonts.alias 644 usr/share/fonts/artwiz-fonts
+	vinstall README 644 usr/share/doc/artwiz-fonts
+}
+
+artwiz-fonts_package() {
+	depends="${makedepends}"
+	noarch="yes"
+	font_dirs="/usr/share/fonts/artwiz-fonts"
+	pkg_install() {
+		vmove usr
+	}
+}
diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template
index 27a2ff27c5..98d947d7f5 100644
--- a/srcpkgs/dwm/template
+++ b/srcpkgs/dwm/template
@@ -21,7 +21,7 @@ do_build() {
 	sed -i 's/^#CFLAGS = -std/CFLAGS += -std/g' config.mk
 	sed -i 's/^LDFLAGS = -g/#LDFLAGS += -g/g' config.mk
 	sed -i 's/^#LDFLAGS = -s/LDFLAGS += -s/g' config.mk
-	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
+	make CC=$CC INCS="-I." LIBS="-lX11"
 }
 
 do_install() {