diff --git a/devel/gindent/Makefile b/devel/gindent/Makefile
index c45d4058ab4..c48c7ad3662 100644
--- a/devel/gindent/Makefile
+++ b/devel/gindent/Makefile
@@ -3,22 +3,18 @@
 # Date created:        1 Nov 1997
 # Whom:                ejovi
 #
-# $OpenBSD: Makefile,v 1.1.1.1 1997/12/02 00:18:41 joey Exp $
+# $OpenBSD: Makefile,v 1.2 1998/03/15 03:44:32 marc Exp $
 #
-        
-DISTNAME=      indent-1.9.1
-CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GNU}
 
-MAINTAINER=    joey@OpenBSD.ORG
-        
-MAN1=          indent.1
+DISTNAME=	indent-1.9.1
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_GNU}
 
-post-install:
-	@mv ${PREFIX}/bin/indent ${PREFIX}/bin/indent
-	@strip ${PREFIX}/bin/indent
-	@test -d ${PREFIX}/info || ${MKDIR} ${PREFIX}/info  \
-		&& chmod a+rx ${PREFIX}/info
+MAINTAINER=	ports@OpenBSD.ORG
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/indent ${PREFIX}/bin/gindent
+	@${INSTALL_MAN} ${WRKSRC}/indent.1 ${PREFIX}/man/man1/gindent.1
 	@if [ ! -f ${PREFIX}/info/dir ]; then \
 	  if [ -f /usr/share/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
@@ -26,6 +22,7 @@ post-install:
 	    touch ${PREFIX}/info/dir ; \
 	  fi ; \
 	fi
+	@${INSTALL_DATA} ${WRKSRC}/indent.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/indent.info ${PREFIX}/info/dir
 
 .include <bsd.port.mk>
diff --git a/devel/gindent/patches/patch-aa b/devel/gindent/patches/patch-aa
deleted file mode 100644
index cb9500bb6a4..00000000000
--- a/devel/gindent/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- makefile.in.orig	Thu Aug 28 17:48:56 1997
-+++ makefile.in	Thu Aug 28 17:50:29 1997
-@@ -51,6 +51,7 @@
- exec_prefix = ${prefix}
- bindir = $(exec_prefix)/bin
- infodir = ${prefix}/info
-+mandir = ${prefix}/man
- 
- #### End of system configuration section. ####
- 
-@@ -126,6 +127,7 @@
- install: all
- 	${INSTALL_PROGRAM} indent ${bindir}/indent
- 	${INSTALL_DATA} ${srcdir}/indent.info ${infodir}/indent.info
-+	${INSTALL_DATA} ${srcdir}/indent.1 ${mandir}/man1/indent.1
- 
- 
- # Cleaning up
diff --git a/devel/gindent/patches/patch-ab b/devel/gindent/patches/patch-ab
new file mode 100644
index 00000000000..87189d9a8a0
--- /dev/null
+++ b/devel/gindent/patches/patch-ab
@@ -0,0 +1,13 @@
+--- indent.info.~1~	Thu Feb  3 09:54:12 1994
++++ indent.info	Sat Mar 14 19:26:31 1998
+@@ -1,6 +1,10 @@
+ This is Info file indent.info, produced by Makeinfo-1.54 from the input
+ file ./indent.texinfo.
+ 
++START-INFO-DIR-ENTRY
++* gindent: (indent).            The GNU C Program Source Indenter
++END-INFO-DIR-ENTRY
++
+    Copyright (C) 1989, 1992, 1993, 1994 Free Software Foundation, Inc.
+ 
+    This is Edition 1.3, January, 1994, of `The `indent' Manual', for
diff --git a/devel/gindent/pkg/PLIST b/devel/gindent/pkg/PLIST
index 5a9507297ab..2e19e7228f6 100644
--- a/devel/gindent/pkg/PLIST
+++ b/devel/gindent/pkg/PLIST
@@ -1,6 +1,7 @@
-bin/indent
-man/man1/indent.1
-info/indent.info
+bin/gindent
+man/man1/gindent.1
 @unexec install-info --delete %D/info/indent.info %D/info/dir
+info/indent.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @exec install-info %D/info/indent.info %D/info/dir
+