diff --git a/sensu/files/handlers/hipchat.json b/sensu/files/handlers/hipchat.json
index 8287c57..4856c8d 100644
--- a/sensu/files/handlers/hipchat.json
+++ b/sensu/files/handlers/hipchat.json
@@ -15,11 +15,10 @@
     "apikey": "{{ handler.apikey }}",
     "apiversion": "{{ handler.apiversion }}",
     "room": "{{ handler.room }}",
-    "from": "Sensu",
-    {%- if handler.message_template is defined %}
+    "from": "{{ handler.from }}"{%- if handler.message_template is defined %},
     "message_template": "optional message template erb file path - /some/path/to/template.erb",
     "message_format": "html"
     {%- endif %}
   }
 }
-{%- endif %}
\ No newline at end of file
+{%- endif %}
diff --git a/sensu/server/_handler_hipchat.sls b/sensu/server/_handler_hipchat.sls
new file mode 100644
index 0000000..e797eb3
--- /dev/null
+++ b/sensu/server/_handler_hipchat.sls
@@ -0,0 +1,35 @@
+
+/etc/sensu/conf.d/hipchat.json:
+  file.managed:
+  - source: salt://sensu/files/handlers/hipchat.json
+  - template: jinja
+  - defaults:
+    handler_name: "{{ handler_name }}"
+    handler_setting: "config"
+  - watch_in:
+    - service: service_sensu_server
+    - service: service_sensu_api
+  - require_in:
+    - file: sensu_conf_dir_clean
+
+/etc/sensu/conf.d/handler_hipchat.json:
+  file.managed:
+  - source: salt://sensu/files/handlers/hipchat.json
+  - template: jinja
+  - defaults:
+    handler_name: "{{ handler_name }}"
+    handler_setting: "handler"
+  - watch_in:
+    - service: service_sensu_server
+    - service: service_sensu_api
+  - require_in:
+    - file: sensu_conf_dir_clean
+
+/etc/sensu/handlers/hipchat.rb:
+  file.managed:
+  - source: salt://sensu/files/plugins/handlers/notification/hipchat.rb
+  - mode: 700
+  - user: sensu
+  - watch_in:
+    - service: service_sensu_server
+    - service: service_sensu_api
\ No newline at end of file