diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 9aa482f6568..7348c3a45a4 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2003/01/21 17:12:30 avsm Exp $
+# $OpenBSD: Makefile,v 1.20 2005/02/11 17:57:30 naddy Exp $
 
 COMMENT=		"convert ASCII files to PostScript"
 
@@ -19,11 +19,12 @@ MASTER_SITES=		http://people.ssh.fi/mtr/genscript/ \
 FLAVORS=		a4
 FLAVOR?=		
 
-CONFIGURE_STYLE=	gnu automake
+WANTLIB=		c m
+
+CONFIGURE_STYLE=	gnu
 
 .if !${FLAVOR:L:Ma4}
 CONFIGURE_ARGS+=	--with-media=Letter
 .endif
 
 .include <bsd.port.mk>
-
diff --git a/print/enscript/patches/patch-afm_Makefile_am b/print/enscript/patches/patch-afm_Makefile_in
similarity index 58%
rename from print/enscript/patches/patch-afm_Makefile_am
rename to print/enscript/patches/patch-afm_Makefile_in
index 019e49147bd..286fdc55c97 100644
--- a/print/enscript/patches/patch-afm_Makefile_am
+++ b/print/enscript/patches/patch-afm_Makefile_in
@@ -1,12 +1,8 @@
-$OpenBSD: patch-afm_Makefile_am,v 1.1 2002/05/11 22:31:24 matt Exp $
-
-        This patch has been sent to the author (Markku Rossi
-        <mtr@iki.fi>).
-
---- afm/Makefile.am.orig	Thu Jul  8 10:36:36 1999
-+++ afm/Makefile.am	Sat May 11 18:11:02 2002
-@@ -36,11 +36,11 @@ public_fonts = matrix.afm matrix.pfa
- EXTRA_DIST = font.map $(default_afm) $(public_fonts)
+$OpenBSD: patch-afm_Makefile_in,v 1.1 2005/02/11 17:57:31 naddy Exp $
+--- afm/Makefile.in.orig	Thu Jan 24 08:39:24 2002
++++ afm/Makefile.in	Fri Feb 11 18:47:55 2005
+@@ -227,14 +227,14 @@ maintainer-clean-generic clean mostlycle
+ 
  
  install-data-local:
 -	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
@@ -21,3 +17,6 @@ $OpenBSD: patch-afm_Makefile_am,v 1.1 2002/05/11 22:31:24 matt Exp $
  uninstall-local:
 -	rm -rf $(datadir)/enscript/afm
 +	rm -rf $(DESTDIR)$(datadir)/enscript/afm
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/print/enscript/patches/patch-lib-Makefile_in b/print/enscript/patches/patch-lib-Makefile_in
index da7eda22dcf..d16614429a5 100644
--- a/print/enscript/patches/patch-lib-Makefile_in
+++ b/print/enscript/patches/patch-lib-Makefile_in
@@ -1,3 +1,4 @@
+$OpenBSD: patch-lib-Makefile_in,v 1.3 2005/02/11 17:57:31 naddy Exp $
 --- lib/Makefile.in.orig	Thu Jan 24 02:39:27 2002
 +++ lib/Makefile.in	Sat May 11 11:03:21 2002
 @@ -254,12 +254,8 @@ mostlyclean distclean maintainer-clean
diff --git a/print/enscript/patches/patch-po-Makefile_in_in b/print/enscript/patches/patch-po-Makefile_in_in
index 33f381fcadc..7b31de7e2ec 100644
--- a/print/enscript/patches/patch-po-Makefile_in_in
+++ b/print/enscript/patches/patch-po-Makefile_in_in
@@ -1,3 +1,4 @@
+$OpenBSD: patch-po-Makefile_in_in,v 1.3 2005/02/11 17:57:31 naddy Exp $
 --- po/Makefile.in.in.orig	Tue Dec  8 02:08:18 1998
 +++ po/Makefile.in.in	Sat May 11 11:04:02 2002
 @@ -111,16 +111,16 @@ install-data: install-data-@USE_NLS@
diff --git a/print/enscript/patches/patch-states_hl_Makefile_am b/print/enscript/patches/patch-states_hl_Makefile_in
similarity index 57%
rename from print/enscript/patches/patch-states_hl_Makefile_am
rename to print/enscript/patches/patch-states_hl_Makefile_in
index 29e048a2ef1..bf2e175d577 100644
--- a/print/enscript/patches/patch-states_hl_Makefile_am
+++ b/print/enscript/patches/patch-states_hl_Makefile_in
@@ -1,12 +1,8 @@
-$OpenBSD: patch-states_hl_Makefile_am,v 1.1 2002/05/11 22:31:24 matt Exp $
-
-        This patch has been sent to the author (Markku Rossi
-        <mtr@iki.fi>).
-
---- states/hl/Makefile.am.orig	Tue Apr  3 12:46:17 2001
-+++ states/hl/Makefile.am	Sat May 11 18:10:09 2002
-@@ -45,11 +45,11 @@ states = $(misc) $(styles) $(languages) 
- EXTRA_DIST = $(states)
+$OpenBSD: patch-states_hl_Makefile_in,v 1.1 2005/02/11 17:57:31 naddy Exp $
+--- states/hl/Makefile.in.orig	Thu Jan 24 08:39:40 2002
++++ states/hl/Makefile.in	Fri Feb 11 18:48:57 2005
+@@ -234,14 +234,14 @@ maintainer-clean-generic clean mostlycle
+ 
  
  install-data-local:
 -	$(top_srcdir)/mkinstalldirs $(datadir)/enscript
@@ -21,3 +17,6 @@ $OpenBSD: patch-states_hl_Makefile_am,v 1.1 2002/05/11 22:31:24 matt Exp $
  uninstall-local:
 -	rm -rf $(datadir)/enscript/hl
 +	rm -rf $(DESTDIR)$(datadir)/enscript/hl
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.