diff --git a/x11/wmi/Makefile b/x11/wmi/Makefile
new file mode 100644
index 00000000000..ff2a612139e
--- /dev/null
+++ b/x11/wmi/Makefile
@@ -0,0 +1,27 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2004/10/17 07:36:55 sturm Exp $
+
+COMMENT=	"window manager improved - key driven window manager"
+
+DISTNAME=	wmi-10	
+CATEGORIES=	x11	
+
+HOMEPAGE=	http://wmi.modprobe.de/	
+
+MAINTAINER=	Julian Frede <julian.frede@gmail.com>
+
+# MIT
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	http://download.berlios.de/wmi/
+
+# not necessary, but to ensure consistent behaviour
+BUILD_DEPENDS=	:pkgconfig-*:devel/pkgconfig
+
+SEPARATE_BUILD=	concurrent
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV=	PKG_CONFIG_PATH="${X11BASE}/lib/pkgconfig"
+
+.include <bsd.port.mk>
diff --git a/x11/wmi/distinfo b/x11/wmi/distinfo
new file mode 100644
index 00000000000..a00deebd2d5
--- /dev/null
+++ b/x11/wmi/distinfo
@@ -0,0 +1,3 @@
+MD5 (wmi-10.tar.gz) = 6728ae28aaa172db3df1e3c2bc483b23
+RMD160 (wmi-10.tar.gz) = 49ba3c481c6149a815c89d9de5f3233ede25edeb
+SHA1 (wmi-10.tar.gz) = 46fbafc5d896863f5e22c2d7c77244b21fbd5d35
diff --git a/x11/wmi/pkg/DESCR b/x11/wmi/pkg/DESCR
new file mode 100644
index 00000000000..85ef22b029e
--- /dev/null
+++ b/x11/wmi/pkg/DESCR
@@ -0,0 +1,34 @@
+WMI is a new lightweight window manager for X11, which attempts to
+combine the best features of LarsWM, Ion , evilwm and ratpoison
+into one window manager.
+
+WMI is new: it is developed from scratch with C++ without any ancient
+code and design dependencies to antiquated window managers.
+
+WMI is lightweight: it has no build- or runtime dependencies except the
+C++ Standard Template Library (STL) and the X11 Library (XLib).
+
+WMI is highly customizable: it is designed with keyboard users in mind.
+Each action (e.g. resizing the frame, creating a new workspace,
+launching an app, note that WMI provides hundreds of actions) can be
+bound to a shortcut. So say good-bye to the rodent :)
+
+WMI is the vim among the window managers: its main user interaction is
+oriented on the two modes of the famous vi editor - command mode and
+normal mode. In WMI the command mode is called input mode and supports
+the context-sensitive execution of actions. Outside this mode, only
+actions which are bound to a shortcut can be invoked.
+
+WMI is flexible: it is able to arrange multiple clients in one frame in
+a maximized way, like Ion does, or to arrange them floating within
+groups of the workspace. The track behavior of larswm can be emulated
+through using two or more frames in a neighbor arrangement.
+
+WMI is evil: The snap to border behavior of evilwm and its fast window
+moving through mouse grabbing can be emulated with floating clients too
+(just try Alt + mouse move over floating clients).
+
+WMI is simple to customize: there's no need to learn Lua for
+customization of the WMI, like Ion or TrsWM does. Only simple property
+files, which are maintainable without the knowledge of yet another
+Turing-complete scripting language.
diff --git a/x11/wmi/pkg/PLIST b/x11/wmi/pkg/PLIST
new file mode 100644
index 00000000000..ed58a496fa1
--- /dev/null
+++ b/x11/wmi/pkg/PLIST
@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2004/10/17 07:36:55 sturm Exp $
+bin/wmi
+bin/wmiremote
+@man man/man1/wmi.1
+@man man/man1/wmiremote.1
+@man man/man5/actions.conf.5
+@man man/man5/common.conf.5
+@man man/man5/session.conf.5
+@man man/man5/theme.conf.5