diff --git a/Makefile.in b/Makefile.in
index 3a7d0b597e..e102070303 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7878,12 +7878,12 @@ samples:
 @COND_USE_XRC_1@	(cd utils/wxrc && $(MAKE) all)
 
 @COND_USE_GUI_1@install-afm: 
-@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/afm
-@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/afm)
+@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/afm
+@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/afm)
 
 @COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/gs_afm
-@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/gs_afm)
+@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/gs_afm
+@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/gs_afm)
 
 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 8fd2a80e71..1df6355a62 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -60,11 +60,11 @@
 
         <data-files-tg id="install-afm" cond="USE_GUI=='1'">
             <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/afm</install-to>
+            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/afm</install-to>
         </data-files-tg>
         <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
             <files>misc/gs_afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/gs_afm</install-to>
+            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/gs_afm</install-to>
         </data-files-tg>
 
         <action id="install-wxconfig">