Index: src_plugins/export_ps/eps.c
===================================================================
--- src_plugins/export_ps/eps.c	(revision 21041)
+++ src_plugins/export_ps/eps.c	(revision 21042)
@@ -197,6 +197,7 @@
 	static int saved_layer_stack[PCB_MAX_LAYER];
 	pcb_box_t tmp, region;
 	pcb_hid_expose_ctx_t ctx;
+	const char *outfn;
 
 	conf_force_set_bool(conf_core.editor.thin_draw, 0);
 	conf_force_set_bool(conf_core.editor.thin_draw_poly, 0);
@@ -276,8 +277,11 @@
 	fprintf(f, "save countdictstack mark newpath /showpage {} def /setpagedevice {pop} def\n");
 	fprintf(f, "%%%%EndProlog\n");
 	fprintf(f, "%%%%Page: 1 1\n");
-	fprintf(f, "%%%%BeginDocument: %s\n\n", filename);
 
+	outfn = pcb_hid_export_fn(filename);
+
+	fprintf(f, "%%%%BeginDocument: %s\n\n", outfn);
+
 	fprintf(f, "72 72 scale\n");
 	fprintf(f, "1 dup neg scale\n");
 	fprintf(f, "%g dup scale\n", options[HA_scale].real_value);
Index: src_plugins/export_ps/ps.c
===================================================================
--- src_plugins/export_ps/ps.c	(revision 21041)
+++ src_plugins/export_ps/ps.c	(revision 21042)
@@ -479,7 +479,7 @@
 	 * %%Title DCS provides text title for the document that is useful
 	 * for printing banner pages.
 	 */
-	fprintf(f, "%%%%Title: %s\n", PCB->Filename);
+	fprintf(f, "%%%%Title: %s\n", pcb_hid_export_fn(PCB->Filename));
 
 	/*
 	 * %%CreationDate DCS indicates the date and time the document was
@@ -842,7 +842,7 @@
 		if (group < 0 || group != lastgroup) {
 			if (global.pagecount == 1) {
 				currenttime = time(NULL);
-				fprintf(global.f, "30 30 moveto (%s) show\n", PCB->Filename);
+				fprintf(global.f, "30 30 moveto (%s) show\n", pcb_hid_export_fn(PCB->Filename));
 
 				fprintf(global.f, "(%d.) tocp\n", global.pagecount);
 				fprintf(global.f, "(Table of Contents \\(This Page\\)) toc\n");
@@ -902,7 +902,7 @@
 
 		fprintf(global.f, "/Helvetica findfont 10 scalefont setfont\n");
 		if (global.legend) {
-			fprintf(global.f, "30 30 moveto (%s) show\n", PCB->Filename);
+			fprintf(global.f, "30 30 moveto (%s) show\n", pcb_hid_export_fn(PCB->Filename));
 			if (PCB->Name)
 				fprintf(global.f, "30 41 moveto (%s, %s) show\n", PCB->Name, pcb_layer_to_file_name(tmp_fn, layer, flags, purpose, purpi, PCB_FNS_fixed));
 			else