diff --git a/x11/dzen2/Makefile b/x11/dzen2/Makefile
new file mode 100644
index 00000000000..a8e6a5943b4
--- /dev/null
+++ b/x11/dzen2/Makefile
@@ -0,0 +1,60 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+
+COMMENT-main=	general purpose messaging, notification and menu program
+COMMENT-gadgets=gadgets and scripts for dzen2
+
+V=			0.8.5
+DISTNAME=		dzen2-$V
+PKGNAME-main=		${DISTNAME}
+PKGNAME-gadgets=	dzen2-gadgets-$V
+CATEGORIES=		x11
+
+HOMEPAGE=		http://gotmor.googlepages.com/dzen
+MAINTAINER=		Dmitri Alenitchev <dma@dma.org.ru>
+
+MULTI_PACKAGES=		-main -gadgets
+
+# MIT/X
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=	Yes
+WANTLIB-main=		X11 c Xinerama Xpm
+WANTLIB-gadgets=	X11 c
+
+MASTER_SITES=		http://gotmor.googlepages.com/
+
+RUN_DEPENDS-gadgets=	:dzen2-*:x11/dzen2
+
+MAKE_FLAGS=		CC=${CC} \
+			CFLAGS="${CFLAGS} -I${X11BASE}/include \
+				-DVERSION=\\\"$V\\\" -DDZEN_XINERAMA \
+				-DDZEN_XPM" \
+			X11LIB=${X11BASE}/lib
+
+GADGETS=		dbar gdbar gcpubar textwidth
+
+NO_REGRESS=		Yes
+
+post-patch:
+	@perl -pi -e 's,\@DZEN\@,${LOCALBASE}/bin/dzen2,' \
+		${WRKSRC}/gadgets/kittscanner.sh
+
+post-build:
+	@cd ${WRKBUILD}/gadgets && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
+		${MAKE_FLAGS} -f ${MAKE_FILE}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dzen2
+	${INSTALL_DATA} ${WRKSRC}/bitmaps/* ${PREFIX}/share/pixmaps
+	cd ${WRKSRC} && ${INSTALL_DATA} CREDITS LICENSE README \
+		README.dzen gadgets/README.kittscanner ${PREFIX}/share/doc/dzen2
+	cd ${WRKSRC}/gadgets && ${INSTALL_SCRIPT} kittscanner.sh noisyalert.sh \
+		${PREFIX}/bin
+.for G in ${GADGETS}
+	${INSTALL_PROGRAM} ${WRKSRC}/gadgets/${G} ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/gadgets/README.${G} ${PREFIX}/share/doc/dzen2
+.endfor
+
+.include <bsd.port.mk>
diff --git a/x11/dzen2/distinfo b/x11/dzen2/distinfo
new file mode 100644
index 00000000000..7b2f7b4f6fa
--- /dev/null
+++ b/x11/dzen2/distinfo
@@ -0,0 +1,5 @@
+MD5 (dzen2-0.8.5.tar.gz) = WXhiDCEkyKitUtfxfOlP1w==
+RMD160 (dzen2-0.8.5.tar.gz) = u++/93nNjrPqBu2gZm9bD+mbe5A=
+SHA1 (dzen2-0.8.5.tar.gz) = khYWPobgKyp13h3+wZVLEFioKeQ=
+SHA256 (dzen2-0.8.5.tar.gz) = Xkzpbo7SKkoK1s+vrN3gUy0T0EnXd0QhSxlsSyvN3/k=
+SIZE (dzen2-0.8.5.tar.gz) = 33274
diff --git a/x11/dzen2/patches/patch-Makefile b/x11/dzen2/patches/patch-Makefile
new file mode 100644
index 00000000000..3cdede105cd
--- /dev/null
+++ b/x11/dzen2/patches/patch-Makefile
@@ -0,0 +1,34 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+--- Makefile.orig	Wed Aug  1 21:16:45 2007
++++ Makefile	Sun Aug 26 22:42:38 2007
+@@ -16,15 +16,12 @@ options:
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: dzen.h action.h config.mk
+ 
+ dzen2: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ ${OBJ} ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ ${OBJ} ${LDFLAGS}
+ 	@echo "Run ./help for documentation"
+ 
+ clean:
+@@ -44,10 +41,8 @@ dist: clean
+ 	@rm -rf dzen2-${VERSION}
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f dzen2 ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dzen2
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} dzen2 ${DESTDIR}${PREFIX}/bin
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/x11/dzen2/patches/patch-config.mk b/x11/dzen2/patches/patch-config.mk
new file mode 100644
index 00000000000..6bca1d7e53b
--- /dev/null
+++ b/x11/dzen2/patches/patch-config.mk
@@ -0,0 +1,24 @@
+--- config.mk.orig	Sat Aug 18 08:18:50 2007
++++ config.mk	Wed Sep  5 17:25:20 2007
+@@ -19,8 +19,8 @@ INCS = -I. -I/usr/include -I${X11INC}
+ # Comment  : Add # to the beginning of the respective lines
+ 
+ # Option 1: No Xinerama no XPM
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
++#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
++#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+ 
+ # Option 2: No Xinerama with XPM
+ #LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm
+@@ -31,8 +31,8 @@ CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+ #CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA
+ 
+ # Option 4: With Xinerama and XPM
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
+-#CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
++LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm
++CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM
+ 
+ # END of feature configuration
+ 
diff --git a/x11/dzen2/patches/patch-gadgets_Makefile b/x11/dzen2/patches/patch-gadgets_Makefile
new file mode 100644
index 00000000000..4b504eea975
--- /dev/null
+++ b/x11/dzen2/patches/patch-gadgets_Makefile
@@ -0,0 +1,59 @@
+$OpenBSD: patch-gadgets_Makefile,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+--- gadgets/Makefile.orig	Wed Sep  5 17:28:21 2007
++++ gadgets/Makefile	Wed Sep  5 17:31:27 2007
+@@ -16,30 +16,21 @@ options:
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+-	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	${CC} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk
+ 
+ dbar: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ dbar.o ${LDFLAGS}
+-	@strip $@
++	${LD} -o $@ dbar.o ${LDFLAGS}
+ 
+ gdbar: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
+-	@strip $@
++	${LD} -o $@ gdbar.o ${LDFLAGS} -L${X11LIB} -lX11
+ 
+ gcpubar: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
+-	@strip $@
++	${LD} -o $@ gcpubar.o ${LDFLAGS} -L${X11LIB}
+ 
+ textwidth: ${OBJ}
+-	@echo LD $@
+-	@${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
+-	@strip $@
++	${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
+ 
+ clean:
+ 	@echo cleaning
+@@ -49,16 +40,9 @@ clean:
+ 	@rm -f ${OBJ} textwidth
+ 
+ install: all
+-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+-	@mkdir -p ${DESTDIR}${PREFIX}/bin
+-	@cp -f dbar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dbar
+-	@cp -f gdbar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gdbar
+-	@cp -f gcpubar ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/gcpubar
+-	@cp -f textwidth ${DESTDIR}${PREFIX}/bin
+-	@chmod 755 ${DESTDIR}${PREFIX}/bin/textwidth
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} dbar gdbar gcpubar textwidth \
++		${DESTDIR}${PREFIX}/bin
+ 
+ uninstall:
+ 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/x11/dzen2/patches/patch-gadgets_kittscanner_sh b/x11/dzen2/patches/patch-gadgets_kittscanner_sh
new file mode 100644
index 00000000000..e17f946ed9a
--- /dev/null
+++ b/x11/dzen2/patches/patch-gadgets_kittscanner_sh
@@ -0,0 +1,13 @@
+$OpenBSD: patch-gadgets_kittscanner_sh,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+--- gadgets/kittscanner.sh.orig	Sat Aug 18 08:18:50 2007
++++ gadgets/kittscanner.sh	Thu Sep  6 16:54:45 2007
+@@ -19,8 +19,7 @@ BG=black
+ 
+ SLEEP=0.1
+ 
+-#DZEN=/usr/local/bin/dzen2
+-DZEN=../dzen2
++DZEN=@DZEN@
+ #DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR"
+ DZENOPTS="-bg $BG -fg $INACTIVE_LED_COLOR -xs 1 -y 30"
+ 
diff --git a/x11/dzen2/pkg/DESCR-gadgets b/x11/dzen2/pkg/DESCR-gadgets
new file mode 100644
index 00000000000..ae546c8c23f
--- /dev/null
+++ b/x11/dzen2/pkg/DESCR-gadgets
@@ -0,0 +1 @@
+Some little helper and sample programs for use with dzen2.
diff --git a/x11/dzen2/pkg/DESCR-main b/x11/dzen2/pkg/DESCR-main
new file mode 100644
index 00000000000..e6102b6f0c3
--- /dev/null
+++ b/x11/dzen2/pkg/DESCR-main
@@ -0,0 +1,4 @@
+Dzen is a general purpose messaging, notification and menu program
+for X11. It was desigend to be scriptable in any language and
+integrate well with window managers like dwm, wmii and xmonad though
+it will work with any windowmanger.
diff --git a/x11/dzen2/pkg/PLIST-gadgets b/x11/dzen2/pkg/PLIST-gadgets
new file mode 100644
index 00000000000..2a9e72a6071
--- /dev/null
+++ b/x11/dzen2/pkg/PLIST-gadgets
@@ -0,0 +1,21 @@
+@comment $OpenBSD: PLIST-gadgets,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+bin/dbar
+bin/gcpubar
+bin/gdbar
+bin/kittscanner.sh
+bin/noisyalert.sh
+bin/textwidth
+share/doc/dzen2/README.dbar
+share/doc/dzen2/README.gcpubar
+share/doc/dzen2/README.gdbar
+share/doc/dzen2/README.kittscanner
+share/doc/dzen2/README.textwidth
+share/pixmaps/
+share/pixmaps/alert.xbm
+share/pixmaps/ball.xbm
+share/pixmaps/battery.xbm
+share/pixmaps/envelope.xbm
+share/pixmaps/music.xbm
+share/pixmaps/pause.xbm
+share/pixmaps/play.xbm
+share/pixmaps/volume.xbm
diff --git a/x11/dzen2/pkg/PLIST-main b/x11/dzen2/pkg/PLIST-main
new file mode 100644
index 00000000000..7373a3e3584
--- /dev/null
+++ b/x11/dzen2/pkg/PLIST-main
@@ -0,0 +1,7 @@
+@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/09/06 19:46:01 merdely Exp $
+bin/dzen2
+share/doc/dzen2/
+share/doc/dzen2/CREDITS
+share/doc/dzen2/LICENSE
+share/doc/dzen2/README
+share/doc/dzen2/README.dzen