diff --git a/puppet/zulip/files/logrotate/smokescreen b/puppet/zulip/files/logrotate/smokescreen
new file mode 100644
index 0000000000..ab0a182cec
--- /dev/null
+++ b/puppet/zulip/files/logrotate/smokescreen
@@ -0,0 +1,11 @@
+/var/log/zulip/smokescreen.log
+{
+    missingok
+    rotate 14
+    daily
+    compress
+    delaycompress
+    notifempty
+    copytruncate
+    create 644 zulip zulip
+}
diff --git a/puppet/zulip/manifests/smokescreen.pp b/puppet/zulip/manifests/smokescreen.pp
index 337f07b841..48e1b601df 100644
--- a/puppet/zulip/manifests/smokescreen.pp
+++ b/puppet/zulip/manifests/smokescreen.pp
@@ -49,4 +49,12 @@ class zulip::smokescreen {
     content => template('zulip/supervisor/smokescreen.conf.erb'),
     notify  => Service[supervisor],
   }
+
+  file { '/etc/logrotate.d/smokescreen':
+    ensure => file,
+    owner  => 'root',
+    group  => 'root',
+    mode   => '0644',
+    source => 'puppet:///modules/zulip/logrotate/smokescreen',
+  }
 }
diff --git a/puppet/zulip/templates/supervisor/smokescreen.conf.erb b/puppet/zulip/templates/supervisor/smokescreen.conf.erb
index 16bcb1efd8..416d95e4aa 100644
--- a/puppet/zulip/templates/supervisor/smokescreen.conf.erb
+++ b/puppet/zulip/templates/supervisor/smokescreen.conf.erb
@@ -6,3 +6,5 @@ autorestart=true
 user=zulip
 redirect_stderr=true
 stdout_logfile=/var/log/zulip/smokescreen.log
+stdout_logfile_maxbytes=0
+stdout_logfile_backups=0