diff --git a/devel/cflow/Makefile b/devel/cflow/Makefile
index d86af85c8a5d..9c7e00d74d5e 100644
--- a/devel/cflow/Makefile
+++ b/devel/cflow/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	cflow
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	SUNSITE/devel/lang/c
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Call graph generator for C code
 
 CONFLICTS=	bsdcflow gnucflow
 
 USES=		gmake
 
 .include <bsd.port.mk>
diff --git a/devel/cflow/files/patch-Makefile b/devel/cflow/files/patch-Makefile
index f9a5cff27a1e..024ff5019c21 100644
--- a/devel/cflow/files/patch-Makefile
+++ b/devel/cflow/files/patch-Makefile
@@ -1,71 +1,71 @@
 --- Makefile.orig	1995-03-06 14:00:20 UTC
 +++ Makefile
 @@ -5,19 +5,19 @@
  endif
  
  # use cp backup option if you have gnu cp
 -CP=cp
 -CP=cp -b
 +#CP=cp
 +#CP=cp -b
  
  # where you want to install
  ifndef PREFIX
 -PREFIX=$(HOME)
 +PREFIX=/usr/local
  endif
  
  # which shell do we use for the cflow to script?
  # I know it works on bash on unix, it also should work with
  # msh on ms-dog
  ifndef CFLOW_SHELL
 -CFLOW_SHELL=/bin/bash
 +CFLOW_SHELL=$(PREFIX)/bin/bash
  endif
  
  # actual location of prcc
 @@ -39,12 +39,13 @@
  LOADLIBES=-L$(HOME)/lib -ldmalloc
  endif
  
 -DEBUG=-g
 -OPT=-O
 -CFLAGS=-Wall $(DEBUG) $(OPT) $(DEFS)
 +#DEBUG=-g
 +#OPT=-O
 +CFLAGS+=$(DEBUG) $(OPT) $(DEFS)
  
  # set this to where to install
 -BINDIR=$(PREFIX)/bin
 +BINDIR=$(DESTDIR)$(PREFIX)/bin
-+MANDIR=$(DESTDIR)$(PREFIX)/man/man1
++MANDIR=$(DESTDIR)$(PREFIX)/share/man/man1
  
  SRCS=cflow.sh prcc.c prcg.c
  
 @@ -64,17 +65,23 @@
  prototypes: 	$(PROTOTYPES)
  
  
 -install:	install-cflow  install-bins
 +install:	install-cflow  install-bins install-man
  
  install-bins: $(BINDIR)/prcc $(BINDIR)/prcg
  
  install-cflow:	$(BINDIR)/cflow
  
 +install-man:	$(MANDIR)/cflow.1.gz
 +
  $(BINDIR)/prcc $(BINDIR)/prcg: $(BINDIR)/%:	%
 -	$(CP) $^ $@
 +	$(BSD_INSTALL_PROGRAM) $^ $@
  
  $(BINDIR)/cflow:	cflow
 -	$(CP) $^ $@
 +	$(BSD_INSTALL_SCRIPT) $^ $@
 +
 +$(MANDIR)/cflow.1.gz:	cflow.1
 +	$(BSD_INSTALL_MAN) $^ $(MANDIR)
 +	gzip -9nf $(MANDIR)/cflow.1
  
  cflow:	cflow.sh
  	sed -e "s;@CFLOW_SHELL@;$(CFLOW_SHELL);g" \
diff --git a/devel/cflow/pkg-plist b/devel/cflow/pkg-plist
index 786d521ca2a8..bbefcadf8ecc 100644
--- a/devel/cflow/pkg-plist
+++ b/devel/cflow/pkg-plist
@@ -1,4 +1,4 @@
 bin/cflow
 bin/prcc
 bin/prcg
-man/man1/cflow.1.gz
+share/man/man1/cflow.1.gz