diff --git a/servers/puppet/files/supervisord/conf.d/feedback-bot.conf b/servers/puppet/files/supervisord/conf.d/feedback-bot.conf
new file mode 100644
index 0000000000..204fd87700
--- /dev/null
+++ b/servers/puppet/files/supervisord/conf.d/feedback-bot.conf
@@ -0,0 +1,4 @@
+[program:feedback-bot]
+command=/home/humbug/humbug/api/bots/feedback-bot
+autostart=true
+user=humbug
diff --git a/servers/puppet/manifests/site.pp b/servers/puppet/manifests/site.pp
index ea3348ee52..f676cf5316 100644
--- a/servers/puppet/manifests/site.pp
+++ b/servers/puppet/manifests/site.pp
@@ -426,7 +426,14 @@ class humbug_bots {
     mode   => 640,
   }
 
-  #TODO: Need to install our supervisor config
+  file { '/etc/supervisor/conf.d/feedback-bot.conf':
+    require => Package['supervisor'],
+    ensure  => file,
+    owner   => 'root',
+    group   => 'root',
+    mode    => 640,
+    source  => "/root/humbug/servers/puppet/files/supervisor/conf.d/feedback-bot.conf",
+  }
 }
 
 class { "humbug_base": }