diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 29b5cd9b5b5..d798151cb14 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.32 2006/10/16 15:49:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2006/10/18 08:20:25 ajacoutot Exp $
 
 COMMENT=	"handle external logins, send and receive faxes"
 
 VERSION=	1.1.35
 RELEASE=	Feb22
 DISTNAME=	mgetty${VERSION}-${RELEASE}
-PKGNAME=	mgetty+sendfax-${VERSION}p1
+PKGNAME=	mgetty+sendfax-${VERSION}p2
 CATEGORIES=	comms
 
 HOMEPAGE=	http://mgetty.greenie.net/
diff --git a/comms/mgetty+sendfax/files/setup b/comms/mgetty+sendfax/files/setup
index dc699ed4528..5eb2432c98a 100644
--- a/comms/mgetty+sendfax/files/setup
+++ b/comms/mgetty+sendfax/files/setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $OpenBSD: setup,v 1.2 2005/09/25 18:18:23 aanriot Exp $
+# $OpenBSD: setup,v 1.3 2006/10/18 08:20:25 ajacoutot Exp $
 
 $confdir = "@sysconfdir@/mgetty+sendfax";
 $defport = "cua00";
@@ -83,7 +83,7 @@ foreach $tty (@ttys) {
     foreach $port (split) {
 	if ($tty =~ /^\s*$port/) {
 	    print STDERR "replacing line $tty";
-	    $tty = "$port\t\"@prefix@/sbin/mgetty\"\tunknown\ton\n";
+	    $tty = "$port\t\"@prefix@/libexec/mgetty\"\tunknown\ton\n";
 	    $replaced{$port} = 1;
 	}
     }
@@ -92,7 +92,7 @@ $_ = $devices;
 foreach $port (split) {
     if (!$replaced{$port}) {
 	print STDERR "adding port $port\n";
-	push (@ttys, "$port\t\"@prefix@/sbin/mgetty\"\tunknown\ton\n");
+	push (@ttys, "$port\t\"@prefix@/libexec/mgetty\"\tunknown\ton\n");
     }
 }
 system ("mv -f /etc/ttys /etc/ttys.old");
diff --git a/comms/mgetty+sendfax/patches/patch-Makefile b/comms/mgetty+sendfax/patches/patch-Makefile
index 63dfc85c24e..28a0e985c32 100755
--- a/comms/mgetty+sendfax/patches/patch-Makefile
+++ b/comms/mgetty+sendfax/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
---- Makefile.orig	Sun Nov 27 09:16:49 2005
-+++ Makefile	Sat Jan 14 12:04:26 2006
+$OpenBSD: patch-Makefile,v 1.3 2006/10/18 08:20:25 ajacoutot Exp $
+--- Makefile.orig	Wed Feb 22 14:58:33 2006
++++ Makefile	Mon Oct 16 13:36:38 2006
 @@ -4,7 +4,7 @@
  #
  # this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -96,7 +96,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  
  # a few C files need extra compiler arguments
  
-@@ -576,7 +576,7 @@ bindist: all doc-all sedscript
+@@ -578,7 +578,7 @@ bindist: all doc-all sedscript
  	cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz *
  
  
@@ -105,7 +105,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  
  install.bin: mgetty sendfax newslock \
  		login.config mgetty.config sendfax.config 
-@@ -584,30 +584,31 @@ install.bin: mgetty sendfax newslock \
+@@ -586,30 +586,31 @@ install.bin: mgetty sendfax newslock \
  # binaries
  #
  	-test -d $(BINDIR)  || ( ./mkidirs $(BINDIR)  ; chmod 755 $(BINDIR)  )
@@ -119,7 +119,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
 -	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
 +#	-mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old
 +#	-mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old
-+	$(BSD_INSTALL_PROGRAM) -m 700 mgetty $(SBINDIR)
++	$(BSD_INSTALL_PROGRAM) -m 700 mgetty $(prefix)/libexec
 +	$(BSD_INSTALL_PROGRAM) sendfax $(SBINDIR)
 +	$(BSD_INSTALL_PROGRAM) callback/callback $(SBINDIR)
  #
@@ -154,7 +154,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  #
  # test for outdated stuff
  #
-@@ -621,28 +622,28 @@ install.bin: mgetty sendfax newslock \
+@@ -623,28 +624,28 @@ install.bin: mgetty sendfax newslock \
  #
  # fax spool directories
  #
@@ -197,7 +197,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  				FAX_OUT_USER=$(FAX_OUT_USER) \
  				BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \
  				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
-@@ -652,14 +653,14 @@ install.bin: mgetty sendfax newslock \
+@@ -654,14 +655,14 @@ install.bin: mgetty sendfax newslock \
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  	    cd compat ; \
  	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
@@ -214,7 +214,7 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  				MAN1DIR=$(MAN1DIR) \
  				MAN4DIR=$(MAN4DIR) \
  				MAN5DIR=$(MAN5DIR) \
-@@ -670,7 +671,7 @@ install.doc:
+@@ -672,7 +673,7 @@ install.doc:
  # WWW frontend stuff
  #
  install.www:
@@ -223,3 +223,12 @@ $OpenBSD: patch-Makefile,v 1.2 2006/01/14 11:59:39 steven Exp $
  				BINDIR=$(BINDIR) \
  				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
  #
+@@ -690,7 +691,7 @@ vgetty:
+ 
+ vgetty-install: sedscript
+ 	cd voice; $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" LDFLAGS="$(LDFLAGS)" \
+-	BINDIR="$(BINDIR)" SBINDIR="$(SBINDIR)" LIBDIR="$(LIBDIR)" \
++	BINDIR="$(BINDIR)" SBINDIR="$(prefix)/libexec" LIBDIR="$(LIBDIR)" \
+ 	CONFDIR="$(CONFDIR)" MAN1DIR="$(MAN1DIR)" MAN8DIR="$(MAN8DIR)" INSTALL="$(INSTALL)" \
+ 	PHONE_GROUP="$(PHONE_GROUP)" PHONE_PERMS="$(PHONE_PERMS)" \
+ 	LN="$(LN)" MV="$(MV)" RM="$(RM)" \
diff --git a/comms/mgetty+sendfax/patches/patch-policy_h_dist b/comms/mgetty+sendfax/patches/patch-policy_h_dist
index 2921b6aace6..f32d89c2505 100755
--- a/comms/mgetty+sendfax/patches/patch-policy_h_dist
+++ b/comms/mgetty+sendfax/patches/patch-policy_h_dist
@@ -1,6 +1,6 @@
-$OpenBSD: patch-policy_h_dist,v 1.2 2006/01/14 11:59:39 steven Exp $
---- policy.h-dist.orig	Wed Nov 30 09:47:42 2005
-+++ policy.h-dist	Sat Jan 14 12:04:26 2006
+$OpenBSD: patch-policy_h_dist,v 1.3 2006/10/18 08:20:25 ajacoutot Exp $
+--- policy.h-dist.orig	Wed Feb 22 14:56:31 2006
++++ policy.h-dist	Mon Oct 16 13:28:34 2006
 @@ -48,7 +48,7 @@
   * Normally, this is "/bin/login", just a few systems put "login"
   * elsewhere (e.g. Free/NetBSD in "/usr/bin/login").
@@ -28,7 +28,7 @@ $OpenBSD: patch-policy_h_dist,v 1.2 2006/01/14 11:59:39 steven Exp $
  #  define LOCK "/var/spool/lock/LCK..%s"
  # endif 
  #endif
-@@ -576,7 +576,7 @@
+@@ -564,7 +564,7 @@
  #endif
  
  #ifndef MAILER
diff --git a/comms/mgetty+sendfax/pkg/PLIST b/comms/mgetty+sendfax/pkg/PLIST
index 0be7e8b9abd..ffa2314d8ac 100644
--- a/comms/mgetty+sendfax/pkg/PLIST
+++ b/comms/mgetty+sendfax/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.12 2006/10/15 16:07:07 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.13 2006/10/18 08:20:25 ajacoutot Exp $
 bin/autopvf
 bin/basictopvf
 bin/faxq
@@ -39,6 +39,8 @@ lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 lib/mgetty+sendfax/faxq-helper
 lib/mgetty+sendfax/setup
+libexec/mgetty
+libexec/vgetty
 @man man/man1/coverpg.1
 @man man/man1/faxq.1
 @man man/man1/faxrunq.1
@@ -61,9 +63,7 @@ lib/mgetty+sendfax/setup
 @man man/man8/vgetty.8
 sbin/callback
 sbin/faxrunqd
-sbin/mgetty
 sbin/sendfax
-sbin/vgetty
 share/doc/mgetty+sendfax/
 share/doc/mgetty+sendfax/faq/
 share/doc/mgetty+sendfax/faq/FAQ.sgml