diff --git a/contrib/dist/redhat/mc.spec.in b/contrib/dist/redhat/mc.spec.in
index d767b964f..68f8e41a0 100644
--- a/contrib/dist/redhat/mc.spec.in
+++ b/contrib/dist/redhat/mc.spec.in
@@ -121,7 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/mc
 %{_bindir}/mcedit
 %{_bindir}/mcview
-%{_bindir}/mcmfmt
 %{_bindir}/mcdiff
 
 %dir %{_libexecdir}/mc
diff --git a/misc/syntax/sh.syntax b/misc/syntax/sh.syntax
index 154c6ba65..f5537dff7 100644
--- a/misc/syntax/sh.syntax
+++ b/misc/syntax/sh.syntax
@@ -475,7 +475,6 @@ wholechars abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._
     keyword whole mcedit cyan
     keyword whole mcookie cyan
     keyword whole mcview cyan
-    keyword whole mcmfmt cyan
     keyword whole memstat cyan
     keyword whole mergechanges cyan
     keyword whole mesg cyan
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ca0d246f..6e7dc122a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,9 +23,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) $(PCRE_CFLAGS)
 localedir = $(datadir)/locale
 pkglibexecdir =		$(libexecdir)/@PACKAGE@
 
-bin_PROGRAMS = mc mcmfmt
-
-mcmfmt_SOURCES = mfmt.c
+bin_PROGRAMS = mc
 
 if USE_EDIT
 EDITLIB = editor/libedit.la
diff --git a/src/mfmt.c b/src/mfmt.c
deleted file mode 100644
index 02fc23531..000000000
--- a/src/mfmt.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* mfmt: sets bold and underline for mail files
-   (c) 1995 miguel de icaza
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-/** \file mfmt.c
- *  \brief Source: sets bold and underline for mail files
- */
-
-#include <stdio.h>
-
-/*** global variables ****************************************************************************/
-
-/*** file scope macro definitions ****************************************************************/
-
-/*** file scope type declarations ****************************************************************/
-
-enum states
-{
-    header,
-    definition,
-    plain,
-    newline,
-    seen_f,
-    seen_r,
-    seen_o,
-    header_new,
-    seen_m
-};
-
-/*** file scope variables ************************************************************************/
-
-/*** file scope functions ************************************************************************/
-/* --------------------------------------------------------------------------------------------- */
-
-/* --------------------------------------------------------------------------------------------- */
-/*** public functions ****************************************************************************/
-/* --------------------------------------------------------------------------------------------- */
-
-int
-main (void)
-{
-    int c;
-    int state = newline;
-    int space_seen = 0;
-
-    while ((c = getchar ()) != EOF)
-    {
-        switch (state)
-        {
-        case plain:
-            if (c == '\n')
-                state = newline;
-            putchar (c);
-            break;
-
-        case newline:
-            if (c == 'F')
-                state = seen_f;
-            else if (c == '\n')
-                putchar ('\n');
-            else
-            {
-                state = plain;
-                putchar (c);
-            }
-            break;
-
-        case seen_f:
-            if (c == 'r')
-                state = seen_r;
-            else
-            {
-                printf ("F%c", c);
-                state = plain;
-            }
-            break;
-
-        case seen_r:
-            if (c == 'o')
-                state = seen_o;
-            else
-            {
-                state = plain;
-                printf ("Fr%c", c);
-            }
-            break;
-
-        case seen_o:
-            if (c == 'm')
-            {
-                state = seen_m;
-            }
-            else
-            {
-                state = plain;
-                printf ("Fro%c", c);
-            }
-            break;
-
-        case seen_m:
-            if (c == ' ')
-            {
-                state = definition;
-                printf ("_\bF_\br_\bo_\bm ");
-            }
-            else
-            {
-                state = plain;
-                printf ("From%c", c);
-            }
-            break;
-
-        case header_new:
-            space_seen = 0;
-            if (c == ' ' || c == '\t')
-            {
-                state = definition;
-                putchar (c);
-                break;
-            }
-            if (c == '\n')
-            {
-                state = plain;
-                putchar (c);
-                break;
-            }
-
-        case header:
-            if (c == '\n')
-            {
-                putchar (c);
-                state = header_new;
-                break;
-            }
-            printf ("_\b%c", c);
-            if (c == ' ')
-                space_seen = 1;
-            if (c == ':' && !space_seen)
-                state = definition;
-            break;
-
-        case definition:
-            if (c == '\n')
-            {
-                putchar (c);
-                state = header_new;
-                break;
-            }
-            printf ("%c\b%c", c, c);
-            break;
-        }
-    }
-    return (0);
-}
-
-/* --------------------------------------------------------------------------------------------- */