diff --git a/lib/Slic3r/GCode/PlaceholderParser.pm b/lib/Slic3r/GCode/PlaceholderParser.pm
index fe92a2438c..4b6011e488 100644
--- a/lib/Slic3r/GCode/PlaceholderParser.pm
+++ b/lib/Slic3r/GCode/PlaceholderParser.pm
@@ -12,7 +12,13 @@ sub BUILD {
     # environment variables
     $s->{$_} = $ENV{$_} for grep /^SLIC3R_/, keys %ENV;
     
-    # timestamp
+    $self->update_timestamp;
+}
+
+sub update_timestamp {
+    my ($self) = @_;
+    
+    my $s = $self->_single;
     my @lt = localtime; $lt[5] += 1900; $lt[4] += 1;
     $s->{timestamp} = sprintf '%04d%02d%02d-%02d%02d%02d', @lt[5,4,3,2,1,0];
     $s->{year}      = $lt[5];
diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index 2ceba32423..34216271ba 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -839,7 +839,7 @@ sub write_gcode {
     }
     
     # prepare the helper object for replacing placeholders in custom G-code and output filename
-    
+    $self->placeholder_parser->update_timestamp;
     
     # set up our helper object
     my $gcodegen = Slic3r::GCode->new(