diff --git a/pcbnew/exporters/export_gencad.cpp b/pcbnew/exporters/export_gencad.cpp
index 70a2a173e8..7fd6164141 100644
--- a/pcbnew/exporters/export_gencad.cpp
+++ b/pcbnew/exporters/export_gencad.cpp
@@ -987,9 +987,9 @@ static bool CreateHeaderInfoData( FILE* aFile, PCB_EDIT_FRAME* aFrame )
     msg = wxT( "DRAWING \"" ) + board->GetFileName() + wxT( "\"\n" );
     fputs( TO_UTF8( msg ), aFile );
 
-    const TITLE_BLOCK&  tb = aFrame->GetTitleBlock();
-
-    msg = wxT( "REVISION \"" ) + tb.GetRevision() + wxT( " " ) + tb.GetDate() + wxT( "\"\n" );
+    wxString rev = ExpandTextVars( board->GetTitleBlock().GetRevision(), board->GetProject() );
+    wxString date = ExpandTextVars( board->GetTitleBlock().GetDate(), board->GetProject() );
+    msg = wxT( "REVISION \"" ) + rev + wxT( " " ) + date + wxT( "\"\n" );
 
     fputs( TO_UTF8( msg ), aFile );
     fputs( "UNITS INCH\n", aFile );
diff --git a/pcbnew/exporters/gerber_jobfile_writer.cpp b/pcbnew/exporters/gerber_jobfile_writer.cpp
index b3461338ec..51a5227d45 100644
--- a/pcbnew/exporters/gerber_jobfile_writer.cpp
+++ b/pcbnew/exporters/gerber_jobfile_writer.cpp
@@ -258,7 +258,7 @@ void GERBER_JOBFILE_WRITER::addJSONGeneralSpecs()
     msg = fn.GetName();
 
     // build the <rec> string. All non ASCII chars and comma are replaced by '_'
-    wxString rev = m_pcb->GetTitleBlock().GetRevision();
+    wxString rev = ExpandTextVars( m_pcb->GetTitleBlock().GetRevision(), m_pcb->GetProject() );
 
     if( rev.IsEmpty() )
         rev = wxT( "rev?" );