2 files changed, 4 insertions, 3 deletions

diff --git a/movemail/Makefile.am b/movemail/Makefile.am
index 7bc622868..975290556 100644
--- a/movemail/Makefile.am
+++ b/movemail/Makefile.am
@@ -30,6 +30,7 @@ movemail_LDADD = \
  ${MU_LIB_MH}\
  ${MU_LIB_MAILDIR}\
  ${MU_LIB_AUTH}\
+ ${MU_LIB_MAILER}\
  @MU_AUTHLIBS@\
  ${MU_LIB_MAILUTILS}\
  @MU_COMMON_LIBRARIES@
diff --git a/movemail/movemail.c b/movemail/movemail.c
index 4e7bdb986..3d3cf2ac5 100644
--- a/movemail/movemail.c
+++ b/movemail/movemail.c
@@ -738,8 +738,8 @@ main (int argc, char **argv)
   MU_APP_INIT_NLS ();
   MU_AUTH_REGISTER_ALL_MODULES ();
   
-  /* Register the desired mailbox formats.  */
-  mu_register_all_mbox_formats ();
+  /* Register the desired "mailbox" formats.  */
+  mu_register_all_formats ();
 
   /* argument parsing */
   
@@ -763,7 +763,7 @@ main (int argc, char **argv)
   if (emacs_mode)
     {
       /* Undo the effect of configuration options that may affect
-         the interaction with Emacs. */
+         interaction with Emacs. */
       mu_registrar_set_default_record (mu_mbox_record);
       mu_debug_default_printer = mu_debug_stderr_printer;
     }