Index: libs/imap/imapd.8.in
===================================================================
--- libs/imap/imapd.8.in.orig
+++ libs/imap/imapd.8.in
@@ -33,9 +33,9 @@
 imapd \- The Courier IMAP server
 .SH "SYNOPSIS"
 .HP \w'\fB@libexecdir@/couriertcpd\fR\ 'u
-\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@prefix@/sbin/imaplogin} [\fImodules\fR...] {@prefix@/bin/imapd} {\&./Maildir}
-.HP \w'\fB@prefix@/bin/imapd\fR\ 'u
-\fB@prefix@/bin/imapd\fR {\&./Maildir}
+\fB@libexecdir@/couriertcpd\fR {couriertcpd\ options} {@sbindir@/imaplogin} [\fImodules\fR...] {@sbindir@/imapd} {\&./Maildir}
+.HP \w'\fB@sbindir@/imapd\fR\ 'u
+\fB@sbindir@/imapd\fR {\&./Maildir}
 .SH "DESCRIPTION"
 .PP
 \fBimapd\fR
Index: libs/imap/imapd-ssl.dist.in
===================================================================
--- libs/imap/imapd-ssl.dist.in.orig
+++ libs/imap/imapd-ssl.dist.in
@@ -102,7 +102,7 @@ IMAP_TLS_REQUIRED=0
 ##NAME: COURIERTLS:0
 #
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PRIORITY:0
 #
Index: libs/imap/pop3d-ssl.dist.in
===================================================================
--- libs/imap/pop3d-ssl.dist.in.orig
+++ libs/imap/pop3d-ssl.dist.in
@@ -87,7 +87,7 @@ POP3_TLS_REQUIRED=0
 # at your own risk.  Only the basic SSL/TLS functionality is known to be
 # working. Keep this in mind as you play with the following variables.
 
-COURIERTLS=@bindir@/couriertls
+COURIERTLS=@sbindir@/couriertls
 
 ##NAME: TLS_PRIORITY:0
 #