diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 8bfb735b7f7..aeef035d5dc 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,12 +1,13 @@
 # New ports collection makefile for:    a2ps
-# Version required:     4.9.9
+# Version required:     4.10.4
 # Date created:         31 January 1998
 # Whom:                 Tobias Weingartner (weingart@openbsd.org)
 #
-# $OpenBSD: Makefile,v 1.5 1998/08/10 22:01:56 marc Exp $
+# $OpenBSD: Makefile,v 1.6 1998/09/30 03:27:07 angelos Exp $
 #
 
-DISTNAME=	a2ps-4.10.3
+DISTNAME=	a2ps-4.10.4
+PKGNAME=	a2ps
 CATEGORIES=	print
 MASTER_SITES=	http://www-inf.enst.fr/~demaille/ftp/a2ps/
 
diff --git a/print/a2ps/files/md5 b/print/a2ps/files/md5
index d2e9f976acd..10d9b8511fa 100644
--- a/print/a2ps/files/md5
+++ b/print/a2ps/files/md5
@@ -1 +1 @@
-MD5 (a2ps-4.10.3.tar.gz) = b40f0576821c3257a907736226117ee6
+MD5 (a2ps-4.10.4.tar.gz) = e976c3502e347d323164a5d40c03f17a
diff --git a/print/a2ps/patches/patch-aa b/print/a2ps/patches/patch-aa
index 7be4485a769..795fe5f598d 100644
--- a/print/a2ps/patches/patch-aa
+++ b/print/a2ps/patches/patch-aa
@@ -1,31 +1,27 @@
---- etc/Makefile.in.~1~	Thu Jun 25 07:23:57 1998
-+++ etc/Makefile.in	Mon Aug 10 11:43:28 1998
-@@ -281,6 +281,8 @@
- all-local: a2ps.cfg
- 
- install-data-local: a2ps.cfg
-+	@$(mkinstalldirs) ${PREFIX}/lib
-+	@$(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).cfg ${PREFIX}/lib/$(PACKAGE).cfg-sample;
- 	$(mkinstalldirs) $(sysconfdir)
- 	@if test -r $(sysconfdir)/$(PACKAGE).cfg; then \
- 	  if cmp $(sysconfdir)/$(PACKAGE).cfg $(top_builddir)/etc/$(PACKAGE).cfg 2> /dev/null ; then \
-@@ -289,15 +291,14 @@
- 	     echo;	\
- 	     echo "*******************";	\
- 	     echo "* Warning: $(sysconfdir)/$(PACKAGE).cfg exist."; \
--	     echo "* It has been moved as $(sysconfdir)/$(PACKAGE).cfg.old"; \
-+	     echo "* It has NOT been changed.  You must update by hand."; \
-+	     echo "* See ${PREFIX}/lib/$(PACKAGE).cfg-sample."; \
- 	     echo "*******************";	\
- 	     echo; \
--	     mv $(sysconfdir)/$(PACKAGE).cfg $(sysconfdir)/$(PACKAGE).cfg.old; \
--	     $(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).cfg $(sysconfdir)/$(PACKAGE).cfg ; \
- 	  fi \
--	else \
-+	 else \
- 	  $(INSTALL_DATA) $(top_builddir)/etc/$(PACKAGE).cfg $(sysconfdir)/$(PACKAGE).cfg; \
--	fi
-+	 fi
- 
- uninstall-local:
- 	rm -f $(sysconfdir)/$(PACKAGE).cfg
+*** src/main.c.orig	Thu Jun 18 17:54:14 1998
+--- src/main.c	Thu Jun 18 17:55:12 1998
+***************
+*** 603,613 ****
+  {
+  #define PREFIX "% "
+    FILE * tmp_file;
+!   char * tmp_filename;
+    char buf [BUFSIZ];
+  
+!   tmp_filename = tmpnam (NULL);
+!   tmp_file = fopen (tmp_filename, "w");
+    if (!tmp_file)
+      error (1, errno, _("cannot open file `%s'"), tmp_filename);
+  
+--- 603,613 ----
+  {
+  #define PREFIX "% "
+    FILE * tmp_file;
+!   char tmp_filename[40];
+    char buf [BUFSIZ];
+  
+!   snprintf(tmp_filename, 40, "%s/a2ps.XXXXXXXX", P_tmpdir);
+!   tmp_file = fdopen (mkstemp(tmp_filename), "w");
+    if (!tmp_file)
+      error (1, errno, _("cannot open file `%s'"), tmp_filename);
+  
diff --git a/print/a2ps/patches/patch-ae b/print/a2ps/patches/patch-ab
similarity index 100%
rename from print/a2ps/patches/patch-ae
rename to print/a2ps/patches/patch-ab
diff --git a/print/a2ps/patches/patch-ad b/print/a2ps/patches/patch-ad
deleted file mode 100644
index 795fe5f598d..00000000000
--- a/print/a2ps/patches/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-*** src/main.c.orig	Thu Jun 18 17:54:14 1998
---- src/main.c	Thu Jun 18 17:55:12 1998
-***************
-*** 603,613 ****
-  {
-  #define PREFIX "% "
-    FILE * tmp_file;
-!   char * tmp_filename;
-    char buf [BUFSIZ];
-  
-!   tmp_filename = tmpnam (NULL);
-!   tmp_file = fopen (tmp_filename, "w");
-    if (!tmp_file)
-      error (1, errno, _("cannot open file `%s'"), tmp_filename);
-  
---- 603,613 ----
-  {
-  #define PREFIX "% "
-    FILE * tmp_file;
-!   char tmp_filename[40];
-    char buf [BUFSIZ];
-  
-!   snprintf(tmp_filename, 40, "%s/a2ps.XXXXXXXX", P_tmpdir);
-!   tmp_file = fdopen (mkstemp(tmp_filename), "w");
-    if (!tmp_file)
-      error (1, errno, _("cannot open file `%s'"), tmp_filename);
-  
diff --git a/print/a2ps/pkg/PLIST b/print/a2ps/pkg/PLIST
index c0450e29476..87d17b6fa0d 100644
--- a/print/a2ps/pkg/PLIST
+++ b/print/a2ps/pkg/PLIST
@@ -1,4 +1,5 @@
 @cwd /usr/local
+bin/composeglyphs
 bin/ogonkify
 bin/compose
 bin/a2ps
@@ -272,6 +273,6 @@ share/a2ps/ppd/level2.ppd
 @exec if test -r /etc/a2ps.cfg; then echo "*******************"; echo "* Warning: /etc/a2ps.cfg exists."; echo "* It has NOT been changed.  You must update by hand."; echo "* See %D/lib/a2ps.cfg-sample."; echo "*******************"; else cp %D/lib/a2ps.cfg /etc; fi
 @unexec echo ""
 @unexec echo "*******************"
-@unexec echo "* You man now remove the file /etc/a2ps.cfg"
+@unexec echo "* You may now remove the file /etc/a2ps.cfg"
 @unexec echo "*******************"
 @unexec echo ""
diff --git a/print/a2ps/pkg/PLIST.alpha b/print/a2ps/pkg/PLIST.alpha
index db5eb5499c6..6e1d6704d73 100644
--- a/print/a2ps/pkg/PLIST.alpha
+++ b/print/a2ps/pkg/PLIST.alpha
@@ -1,4 +1,5 @@
 @cwd /usr/local
+bin/composeglyphs
 bin/ogonkify
 bin/compose
 bin/a2ps