diff --git a/fonts/.cvsignore b/fonts/.cvsignore
index c46c3a3a963..8b58a76f706 100644
--- a/fonts/.cvsignore
+++ b/fonts/.cvsignore
@@ -5,7 +5,7 @@ wine_courer.fon
 wine_courier-1250-96-13.fnt
 wine_courier-1251-96-13.fnt
 wine_courier-1252-96-13.fnt
-wine_courier.
+wine_courier.ttf
 wine_marlett.ttf
 wine_sans_serif-1250-96-13.fnt
 wine_sans_serif-1250-96-16.fnt
@@ -15,14 +15,14 @@ wine_sans_serif-1251-96-20.fnt
 wine_sans_serif-1252-96-13.fnt
 wine_sans_serif-1252-96-16.fnt
 wine_sans_serif-1252-96-20.fnt
-wine_sans_serif.
+wine_sans_serif.ttf
 wine_sserife.fon
 wine_sserifee.fon
 wine_sserifer.fon
 wine_system-1250-96-16.fnt
 wine_system-1251-96-16.fnt
 wine_system-1252-96-16.fnt
-wine_system.
+wine_system.ttf
 wine_vgasys.fon
 wine_vgasyse.fon
 wine_vgasysr.fon
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index dd9a3856203..60b7bd62b9f 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -27,55 +27,55 @@ all: $(FONTS)
 
 @MAKE_RULES@
 
-wine_courier.: wine_courier.sfd
+wine_courier.ttf: wine_courier.sfd
 	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_sans_serif.: wine_sans_serif.sfd
+wine_sans_serif.ttf: wine_sans_serif.sfd
 	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_system.: wine_system.sfd
+wine_system.ttf: wine_system.sfd
 	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
 
-wine_courier-1252-96-13.fnt: wine_courier. $(SFNT2FNT)
+wine_courier-1252-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1252 96 128 8
 
-wine_courier-1250-96-13.fnt: wine_courier. $(SFNT2FNT)
+wine_courier-1250-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1250 96 128 8
 
-wine_courier-1251-96-13.fnt: wine_courier. $(SFNT2FNT)
+wine_courier-1251-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1251 96 128 8
 
-wine_sans_serif-1252-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1252-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1252 96 129 5
 
-wine_sans_serif-1252-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1252-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1252 96 129 7
 
-wine_sans_serif-1252-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1252-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 20 1252 96 129 8
 
-wine_sans_serif-1250-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1250-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1250 96 129 5
 
-wine_sans_serif-1250-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1250-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1250 96 129 7
 
-wine_sans_serif-1251-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1251-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 13 1251 96 129 5
 
-wine_sans_serif-1251-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1251-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1251 96 129 7
 
-wine_sans_serif-1251-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
+wine_sans_serif-1251-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 20 1251 96 129 8
 
-wine_system-1252-96-16.fnt: wine_system. $(SFNT2FNT)
+wine_system-1252-96-16.fnt: wine_system.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1252 96 128 7
 
-wine_system-1250-96-16.fnt: wine_system. $(SFNT2FNT)
+wine_system-1250-96-16.fnt: wine_system.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1250 96 128 7
 
-wine_system-1251-96-16.fnt: wine_system. $(SFNT2FNT)
+wine_system-1251-96-16.fnt: wine_system.ttf $(SFNT2FNT)
 	$(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7
 
 wine_sserife.fon: wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $(FNT2FON)
@@ -114,6 +114,6 @@ uninstall::
 	-rmdir $(fontdir)
 
 clean::
-	$(RM) *.fon *.fnt *.ttf wine_courier. wine_sans_serif. wine_system.
+	$(RM) *.fon *.fnt *.ttf
 
 ### Dependencies: