diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile
index 5cc4e80ecdc5..585bd89e5c00 100644
--- a/x11-clocks/wmclockmon/Makefile
+++ b/x11-clocks/wmclockmon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wmclockmon
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.8.0
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
@@ -19,17 +18,18 @@ USE_XPM=	yes
 USE_GNOME=	gtk12
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=""
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-MAN1=		${PORTNAME}.1
-PLIST_FILES=	bin/wmclockmon
+MAN1=		wmclockmon.1 wmclockmon-config.1 wmclockmon-cal.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g' \
 		${WRKSRC}/wmclockmon-config/Makefile.in
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/wmclockmon ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/doc/wmclockmon.1 ${PREFIX}/man/man1
+post-install:
+	@${MKDIR} ${EXAMPLESDIR}
+.for i in 1 2
+	@${INSTALL_DATA} ${WRKSRC}/doc/sample${i}.wmclockmonrc ${EXAMPLESDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/wmclockmon/distinfo b/x11-clocks/wmclockmon/distinfo
index c7cfeab96806..e62d36968f2e 100644
--- a/x11-clocks/wmclockmon/distinfo
+++ b/x11-clocks/wmclockmon/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmclockmon-0.5.2.tar.gz) = 41e88b9b856ca883e64f0e16b1802026
-SIZE (wmclockmon-0.5.2.tar.gz) = 123474
+MD5 (wmclockmon-0.8.0.tar.gz) = fb6d9c18d2598a5a0a9e56ae058c0f50
+SIZE (wmclockmon-0.8.0.tar.gz) = 141082
diff --git a/x11-clocks/wmclockmon/files/patch-configure b/x11-clocks/wmclockmon/files/patch-configure
deleted file mode 100644
index 47c2a108b372..000000000000
--- a/x11-clocks/wmclockmon/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Sep 21 02:14:44 2002
-+++ configure	Sat Sep 21 02:14:52 2002
-@@ -4051,8 +4051,6 @@
-   OS=freebsd
-   ignore_wired=yes
-   ignore_cached=yes
--  LIBS="$LIBS -lkvm"
--  SETGID_FLAGS="-g kmem -m 2755 -o root"
-   ;;
- openbsd*)
-   OS=openbsd
diff --git a/x11-clocks/wmclockmon/pkg-plist b/x11-clocks/wmclockmon/pkg-plist
new file mode 100644
index 000000000000..4956cc12f63a
--- /dev/null
+++ b/x11-clocks/wmclockmon/pkg-plist
@@ -0,0 +1,77 @@
+bin/wmclockmon
+bin/wmclockmon-cal
+bin/wmclockmon-config
+%%EXAMPLESDIR%%/sample1.wmclockmonrc
+%%EXAMPLESDIR%%/sample2.wmclockmonrc
+share/wmclockmon/backlight0_off.xpm
+share/wmclockmon/backlight0_on.xpm
+share/wmclockmon/backlight1_off.xpm
+share/wmclockmon/backlight1_on.xpm
+share/wmclockmon/backlight2_off.xpm
+share/wmclockmon/backlight2_on.xpm
+share/wmclockmon/backlight3_off.xpm
+share/wmclockmon/backlight3_on.xpm
+share/wmclockmon/backlight4_off.xpm
+share/wmclockmon/backlight4_on.xpm
+share/wmclockmon/backlight5_off.xpm
+share/wmclockmon/backlight5_on.xpm
+share/wmclockmon/backlight6_off.xpm
+share/wmclockmon/backlight6_on.xpm
+share/wmclockmon/backlightB_color_off.xpm
+share/wmclockmon/backlightB_color_on.xpm
+share/wmclockmon/backlightB_new_off.xpm
+share/wmclockmon/backlightB_new_on.xpm
+share/wmclockmon/backlightB_off.xpm
+share/wmclockmon/backlightB_old_off.xpm
+share/wmclockmon/backlightB_old_on.xpm
+share/wmclockmon/backlightB_on.xpm
+share/wmclockmon/backlightI_color_off.xpm
+share/wmclockmon/backlightI_color_on.xpm
+share/wmclockmon/backlightI_off.xpm
+share/wmclockmon/backlightI_on.xpm
+share/wmclockmon/backlight_0_color_off.xpm
+share/wmclockmon/backlight_0_color_on.xpm
+share/wmclockmon/backlight_1_color_off.xpm
+share/wmclockmon/backlight_1_color_on.xpm
+share/wmclockmon/backlight_2_color_off.xpm
+share/wmclockmon/backlight_2_color_on.xpm
+share/wmclockmon/backlight_3_color_off.xpm
+share/wmclockmon/backlight_3_color_on.xpm
+share/wmclockmon/backlight_4_color_off.xpm
+share/wmclockmon/backlight_4_color_on.xpm
+share/wmclockmon/backlight_5_color_off.xpm
+share/wmclockmon/backlight_5_color_on.xpm
+share/wmclockmon/backlight_6_color_off.xpm
+share/wmclockmon/backlight_6_color_on.xpm
+share/wmclockmon/default.bwcs
+share/wmclockmon/default.iwcs
+share/wmclockmon/default.lwcs
+share/wmclockmon/default.mwcs
+share/wmclockmon/default.pwcs
+share/wmclockmon/lcd1.mwcs
+share/wmclockmon/lcd2.mwcs
+share/wmclockmon/lcd3.mwcs
+share/wmclockmon/lcd4.mwcs
+share/wmclockmon/lcd5.mwcs
+share/wmclockmon/lcd6.mwcs
+share/wmclockmon/led.bwcs
+share/wmclockmon/led.iwcs
+share/wmclockmon/led.lwcs
+share/wmclockmon/led.pwcs
+share/wmclockmon/led0.mwcs
+share/wmclockmon/led1.mwcs
+share/wmclockmon/led2.mwcs
+share/wmclockmon/led3.mwcs
+share/wmclockmon/led4.mwcs
+share/wmclockmon/led5.mwcs
+share/wmclockmon/led6.mwcs
+share/wmclockmon/letters.xpm
+share/wmclockmon/letters_color.xpm
+share/wmclockmon/letters_new.xpm
+share/wmclockmon/new.bwcs
+share/wmclockmon/new.lwcs
+share/wmclockmon/new.mwcs
+share/wmclockmon/new.pwcs
+share/wmclockmon/parts.xpm
+share/wmclockmon/parts_color.xpm
+share/wmclockmon/parts_new.xpm