diff --git a/ChangeLog b/ChangeLog
index 27a6778d..da49a771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16037,3 +16037,5 @@
 	in the [Provisioning] section of rd.conf(5).
 2017-10-02 Fred Gleason <fredg@paravelsystems.com>
 	* Added an '%s' datetime wildcard for Service Name.
+2017-10-03 Fred Gleason <fredg@paravelsystems.com>
+	* Implemented the '%s' wildcard in the report file path.
diff --git a/lib/export_bmiemr.cpp b/lib/export_bmiemr.cpp
index 5a1dc08e..2d70d64e 100644
--- a/lib/export_bmiemr.cpp
+++ b/lib/export_bmiemr.cpp
@@ -39,9 +39,11 @@ bool RDReport::ExportBmiEmr(const QDate &startdate,const QDate &enddate,
   QString station_format=stationFormat();
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   //
diff --git a/lib/export_cutlog.cpp b/lib/export_cutlog.cpp
index 70503672..8482401b 100644
--- a/lib/export_cutlog.cpp
+++ b/lib/export_cutlog.cpp
@@ -41,9 +41,11 @@ bool RDReport::ExportCutLog(const QDate &startdate,const QDate &enddate,
   QString cart_num;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_deltaflex.cpp b/lib/export_deltaflex.cpp
index ac9d6be6..2ca21fae 100644
--- a/lib/export_deltaflex.cpp
+++ b/lib/export_deltaflex.cpp
@@ -43,9 +43,11 @@ bool RDReport::ExportDeltaflex(const QDate &startdate,const QDate &enddate,
   QString air_fmt;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_musicclassical.cpp b/lib/export_musicclassical.cpp
index 666eec5f..73c94727 100644
--- a/lib/export_musicclassical.cpp
+++ b/lib/export_musicclassical.cpp
@@ -41,9 +41,11 @@ bool RDReport::ExportMusicClassical(const QDate &startdate,const QDate &enddate,
   QString cart_num;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_musicplayout.cpp b/lib/export_musicplayout.cpp
index 72cf9faa..ce167db1 100644
--- a/lib/export_musicplayout.cpp
+++ b/lib/export_musicplayout.cpp
@@ -41,9 +41,11 @@ bool RDReport::ExportMusicPlayout(const QDate &startdate,const QDate &enddate,
   QString cart_num;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_musicsummary.cpp b/lib/export_musicsummary.cpp
index b042f4e7..7ec6df9d 100644
--- a/lib/export_musicsummary.cpp
+++ b/lib/export_musicsummary.cpp
@@ -40,9 +40,11 @@ bool RDReport::ExportMusicSummary(const QDate &startdate,const QDate &enddate,
   QString str;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_nprsoundex.cpp b/lib/export_nprsoundex.cpp
index 61231530..dca9b608 100644
--- a/lib/export_nprsoundex.cpp
+++ b/lib/export_nprsoundex.cpp
@@ -51,9 +51,11 @@ bool RDReport::ExportNprSoundEx(const QDate &startdate,const QDate &enddate,
   QString channel_name=stationId();
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
   if((f=fopen(filename,"wb"))==NULL) {
     report_error_code=RDReport::ErrorCantOpen;
diff --git a/lib/export_radiotraffic.cpp b/lib/export_radiotraffic.cpp
index f5ca6bc5..77053b2a 100644
--- a/lib/export_radiotraffic.cpp
+++ b/lib/export_radiotraffic.cpp
@@ -38,9 +38,11 @@ bool RDReport::ExportRadioTraffic(const QDate &startdate,const QDate &enddate,
   QString air_fmt;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_soundex.cpp b/lib/export_soundex.cpp
index 75797656..83c08d44 100644
--- a/lib/export_soundex.cpp
+++ b/lib/export_soundex.cpp
@@ -48,9 +48,11 @@ bool RDReport::ExportSoundEx(const QDate &startdate,const QDate &enddate,
   QString channel_name=stationId();
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   //
diff --git a/lib/export_spincount.cpp b/lib/export_spincount.cpp
index 24600889..aab334b5 100644
--- a/lib/export_spincount.cpp
+++ b/lib/export_spincount.cpp
@@ -50,9 +50,11 @@ bool RDReport::ExportSpinCount(const QDate &startdate,const QDate &enddate,
 
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/lib/export_technical.cpp b/lib/export_technical.cpp
index c75e1ff5..c16c660a 100644
--- a/lib/export_technical.cpp
+++ b/lib/export_technical.cpp
@@ -44,9 +44,11 @@ bool RDReport::ExportTechnical(const QDate &startdate,const QDate &enddate,
   char eol[3]="\n";
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
   if(incl_crs) {
     strcpy(eol,"\r\n");
   }
diff --git a/lib/export_textlog.cpp b/lib/export_textlog.cpp
index b29a7de5..6cd35da3 100644
--- a/lib/export_textlog.cpp
+++ b/lib/export_textlog.cpp
@@ -42,9 +42,11 @@ bool RDReport::ExportTextLog(const QDate &startdate,const QDate &enddate,
   QString cart_num;
 
 #ifdef WIN32
-  QString filename=RDDateDecode(exportPath(RDReport::Windows),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Windows),startdate,serviceName());
 #else
-  QString filename=RDDateDecode(exportPath(RDReport::Linux),startdate);
+  QString filename=
+    RDDateDecode(exportPath(RDReport::Linux),startdate,serviceName());
 #endif
 
   QFile file(filename);
diff --git a/rdadmin/test_import.cpp b/rdadmin/test_import.cpp
index e9bd213e..288f749f 100644
--- a/rdadmin/test_import.cpp
+++ b/rdadmin/test_import.cpp
@@ -253,7 +253,8 @@ void TestImport::importData()
 void TestImport::dateChangedData(const QDate &date)
 {
   test_filename_edit->
-    setText(RDDateDecode(test_svc->importPath(test_src,RDSvc::Linux),date));
+    setText(RDDateDecode(test_svc->importPath(test_src,RDSvc::Linux),date,
+			 test_svc->name()));
 }