diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index 002362af26bc..26b11516bb95 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -1,49 +1,50 @@
 # New ports collection makefile for:	mpeglib_artsplug
 # Date created:				July 09 2004
 # Whom:					Michael Nottebrock <lofi@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kompmgr
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 PKGNAMEPREFIX=	kdebase-
 DISTNAME=	kdebase-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utility needed to enable XComposite support in KDE
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kdebase-${PORTVERSION}
 INSTALLS_SHLIB=	yes
 
 CONFIGURE_ARGS+=--without-java
 
 PLIST_FILES=	bin/kompmgr
 
 .include <bsd.port.pre.mk>
 
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	Requires the composite extension, which is unavailable with XFree86
 .endif
 
 pre-configure:
 	${CP} ${FILESDIR}/configure ${WRKSRC}/
 
 do-build:
 	cd ${WRKSRC}/kwin/kompmgr && ${GMAKE}
 
 do-install:
 	cd ${WRKSRC}/kwin/kompmgr && ${GMAKE} install
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.post.mk>
diff --git a/x11-wm/kompmgr/files/patch-kwin_kompmgr_kompmgr.c b/x11-wm/kompmgr/files/patch-kwin_kompmgr_kompmgr.c
new file mode 100644
index 000000000000..3aea64e34818
--- /dev/null
+++ b/x11-wm/kompmgr/files/patch-kwin_kompmgr_kompmgr.c
@@ -0,0 +1,28 @@
+--- kwin/kompmgr/kompmgr.c.orig	Tue Jul  5 16:23:25 2005
++++ kwin/kompmgr/kompmgr.c	Tue Jul  5 16:25:43 2005
+@@ -1807,6 +1807,7 @@
+ {
+ 	win				*new = malloc (sizeof (win));
+ 	win				**p;
++	unsigned int 			tmp;
+ 
+ 	if (!new)
+ 		return;
+@@ -1867,7 +1868,7 @@
+ 	new->shadowSize = get_shadow_prop (dpy, new);
+ 	new->shapable = get_shapable_prop(dpy, new);
+ 	new->titleHeight = get_titleHeight_prop(dpy, new);
+-        unsigned int tmp = get_dim_prop(dpy, new);
++        tmp = get_dim_prop(dpy, new);
+         new->dimPicture = (tmp < OPAQUE) ? solid_picture (dpy, True, (double)tmp/OPAQUE, 0.1, 0.1, 0.1) : None;
+ 	new->windowType = determine_wintype (dpy, new->id);
+         determine_mode (dpy, new);
+@@ -2411,7 +2411,7 @@
+ 		const char *home = getenv("HOME");
+ 		const char *configfile = "/.xcompmgrrc"; 
+         wasNull = True;
+-		filename = (char*)malloc((strlen(home)+strlen(configfile)+1)*sizeof(char));
++		filename = (char*)calloc((strlen(home)+strlen(configfile)+1), sizeof(char));
+ 
+ 		strcat(filename, home);
+ 		strcat(filename, configfile);