diff --git a/x11/wmname/Makefile b/x11/wmname/Makefile
new file mode 100644
index 00000000000..12882148959
--- /dev/null
+++ b/x11/wmname/Makefile
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/03/16 20:42:41 sturm Exp $
+
+COMMENT =	sets the window manager name property of the root window
+
+DISTNAME =	wmname-0.1
+
+CATEGORIES =	x11
+
+HOMEPAGE =	http://tools.suckless.org/wmname
+
+# MIT/X
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+WANTLIB =	X11 c
+
+MASTER_SITES =	http://code.suckless.org/dl/tools/
+
+USE_X11 =	Yes
+
+NO_REGRESS =	Yes
+
+.include <bsd.port.mk>
diff --git a/x11/wmname/distinfo b/x11/wmname/distinfo
new file mode 100644
index 00000000000..a0ccf149370
--- /dev/null
+++ b/x11/wmname/distinfo
@@ -0,0 +1,5 @@
+MD5 (wmname-0.1.tar.gz) = aQPSmfhNM15Sn70sHW5J/g==
+RMD160 (wmname-0.1.tar.gz) = iOUtSVdq5HKkW9QMeewEBxFgu84=
+SHA1 (wmname-0.1.tar.gz) = e85gMGzMnJpfxg2YdOgaAT76iHE=
+SHA256 (wmname-0.1.tar.gz) = VZrRiLKRMWfcuzfs+7ftR0p+xLvLASnY1dCMuSCNAsU=
+SIZE (wmname-0.1.tar.gz) = 2512
diff --git a/x11/wmname/patches/patch-Makefile b/x11/wmname/patches/patch-Makefile
new file mode 100644
index 00000000000..53452a90a2c
--- /dev/null
+++ b/x11/wmname/patches/patch-Makefile
@@ -0,0 +1,35 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2009/03/16 20:42:41 sturm Exp $
+--- Makefile.orig	Sat Aug  2 20:36:10 2008
++++ Makefile	Mon Mar 16 21:20:36 2009
+@@ -15,15 +15,12 @@ options:
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk
+ 
+ wmname: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ ${OBJ} ${LDFLAGS}
+ 
+ clean:
+ 	@echo cleaning
+@@ -38,10 +35,9 @@ dist: clean
+ 	@rm -rf wmname-${VERSION}
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f wmname ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/wmname
++	@echo installing executable file to ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM_DIR} ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} wmname ${PREFIX}/bin
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/x11/wmname/patches/patch-config_mk b/x11/wmname/patches/patch-config_mk
new file mode 100644
index 00000000000..6a247e876ae
--- /dev/null
+++ b/x11/wmname/patches/patch-config_mk
@@ -0,0 +1,30 @@
+$OpenBSD: patch-config_mk,v 1.1.1.1 2009/03/16 20:42:41 sturm Exp $
+--- config.mk.orig	Mon Mar 16 21:11:23 2009
++++ config.mk	Mon Mar 16 21:15:45 2009
+@@ -4,21 +4,19 @@ VERSION = 0.1
+ # Customize below to fit your system
+ 
+ # paths
+-PREFIX = /usr/local
+-MANPREFIX = ${PREFIX}/share/man
++MANPREFIX = ${PREFIX}/man
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = ${X11BASE}/include
++X11LIB = ${X11BASE}/lib
+ 
+ # includes and libs
+-INCS = -I. -I/usr/include -I${X11INC}
++INCS = -I. -I${X11INC}
+ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"${VERSION}\"
+-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
++CFLAGS += -pedantic -Wall ${INCS} ${CPPFLAGS}
+ LDFLAGS = -s ${LIBS}
+ 
+ # compiler and linker
+-CC = cc
+ LD = ${CC}
diff --git a/x11/wmname/pkg/DESCR b/x11/wmname/pkg/DESCR
new file mode 100644
index 00000000000..5361b3d20a1
--- /dev/null
+++ b/x11/wmname/pkg/DESCR
@@ -0,0 +1,12 @@
+wmname prints/sets the window manager name property of the root window
+similar to how hostname(1) behaves.
+
+wmname is a nice utility to fix problems with JDK versions and other broken
+programs assuming a reparenting window manager for instance.
+
+Usage:
+The following command prints the window manager name, if any:
+$ wmname
+
+The following command sets the window manager name, e.g.
+$ wmname LG3D
diff --git a/x11/wmname/pkg/PLIST b/x11/wmname/pkg/PLIST
new file mode 100644
index 00000000000..e344ce54ce1
--- /dev/null
+++ b/x11/wmname/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/03/16 20:42:41 sturm Exp $
+@bin bin/wmname