diff --git a/Make.rules.in b/Make.rules.in
index 69abe7fe08..7e50787112 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -28,13 +28,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_
 CROSSOBJS = $(OBJS:.o=.cross.o)
 ALLCROSSCFLAGS = $(DEFS) -DWINE_CROSSTEST $(CPPFLAGS) $(CFLAGS)
 
-# Implicit rules
-
-@MAINTAINER_MODE@.SUFFIXES: .sfd .ttf
-
-.sfd.ttf:
-	$(FONTFORGE) -script $(top_srcdir)/fonts/genttf.ff $< $@
-
 # Rules for main module
 
 $(MODULE) $(MODULE:%=%.so) $(MODULE:%=%.fake): $(MAINSPEC) $(OBJS)
diff --git a/configure b/configure
index ccd78d655e..de73ca9928 100755
--- a/configure
+++ b/configure
@@ -722,7 +722,6 @@ ICOTOOL
 CONVERT
 RSVG
 FONTFORGE
-MAINTAINER_MODE
 PKG_CONFIG
 MSGFMT
 INSTALL_DATA
@@ -5584,8 +5583,6 @@ fi
 
 if test "x$enable_maintainer_mode" != "xyes"
 then
-  MAINTAINER_MODE=\#
-
   FONTFORGE=""
   RSVG=""
   CONVERT=""
diff --git a/configure.ac b/configure.ac
index 21de44aed6..e0455a27b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,7 +276,6 @@ WINE_PATH_PKG_CONFIG
 
 if test "x$enable_maintainer_mode" != "xyes"
 then
-  AC_SUBST([MAINTAINER_MODE],[\#])
   FONTFORGE=""
   RSVG=""
   CONVERT=""
diff --git a/dlls/gdi32/tests/Makefile.in b/dlls/gdi32/tests/Makefile.in
index dee2fa4537..19b63a95a8 100644
--- a/dlls/gdi32/tests/Makefile.in
+++ b/dlls/gdi32/tests/Makefile.in
@@ -17,6 +17,11 @@ C_SRCS = \
 	path.c \
 	pen.c
 
+FONT_SRCS = \
+	vertical.sfd \
+	wine_test.sfd \
+	wine_vdmx.sfd
+
 RC_SRCS = resource.rc
 
 @MAKE_TEST_RULES@
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 1354dc0756..6650af5117 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -1,3 +1,17 @@
+FONT_SRCS = \
+	courier.sfd \
+	fixedsys.sfd \
+	fixedsys_jp.sfd \
+	marlett.sfd \
+	ms_sans_serif.sfd \
+	small_fonts.sfd \
+	small_fonts_jp.sfd \
+	symbol.sfd \
+	system.sfd \
+	tahoma.sfd \
+	tahomabd.sfd \
+	wingding.sfd
+
 BITMAP_FONTS  = \
 	coue1255.fon \
 	coue1256.fon \
diff --git a/tools/make_makefiles b/tools/make_makefiles
index 9ebc47631b..ef26aafb98 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -276,7 +276,7 @@ sub parse_makefile($)
             ${$make{"=flags"}}{"implib"} = 1 if $var eq "IMPORTLIB";
             next;
         }
-        if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/)
+        if (/^\s*(BISON_SRCS|LEX_SRCS|IDL_[CHIPRS]_SRCS|IDL_TLB_SRCS|IMPLIB_SRCS|C_SRCS|OBJC_SRCS|MC_SRCS|RC_SRCS|SVG_SRCS|FONT_SRCS|IN_SRCS|PROGRAMS|MANPAGES)\s*=\s*(.*)/)
         {
             my $var = $1;
             my @list = split(/\s+/, $2);
@@ -408,6 +408,7 @@ sub assign_sources_to_makefiles(@)
             elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; }
             elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; }
             elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; }
+            elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; }
             elsif ($name =~ /\.c$/)
             {
                 my %flags = get_makedep_flags( $file );
@@ -563,6 +564,7 @@ sub update_makefiles(@)
         replace_makefile_variable( $file, "BISON_SRCS" );
         replace_makefile_variable( $file, "MC_SRCS" );
         replace_makefile_variable( $file, "SVG_SRCS" );
+        replace_makefile_variable( $file, "FONT_SRCS" );
         replace_makefile_variable( $file, "C_SRCS" );
         replace_makefile_variable( $file, "OBJC_SRCS" );
         replace_makefile_variable( $file, "RC_SRCS" );
diff --git a/tools/makedep.c b/tools/makedep.c
index 3b4ffcd240..041ef2eaaf 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -1498,6 +1498,18 @@ static struct strarray output_sources(void)
             output( "\t$(SED_CMD) %s >$@ || ($(RM) $@ && false)\n", source->filename );
             column += output( "%s:", obj );
         }
+        else if (!strcmp( ext, "sfd" ))  /* font file */
+        {
+            char *fontforge = get_expanded_make_variable( "FONTFORGE" );
+            if (fontforge && !src_dir)
+            {
+                output( "%s.ttf: %s\n", obj, source->filename );
+                output( "\t%s -script %s/fonts/genttf.ff %s $@\n",
+                        fontforge, top_src_dir ? top_src_dir : top_obj_dir, source->filename );
+            }
+            free( fontforge );
+            continue;  /* no dependencies */
+        }
         else if (!strcmp( ext, "svg" ))  /* svg file */
         {
             char *convert = get_expanded_make_variable( "CONVERT" );
@@ -1781,6 +1793,7 @@ static void update_makefile( const char *path )
         "LEX_SRCS",
         "XTEMPLATE_SRCS",
         "SVG_SRCS",
+        "FONT_SRCS",
         "IN_SRCS",
         "MANPAGES",
         NULL