diff --git a/src/connection.cc b/src/connection.cc
index 20fdbaa..41040ae 100644
--- a/src/connection.cc
+++ b/src/connection.cc
@@ -675,6 +675,8 @@ bool Connection::ConnectDB(const char* paramString) {
   uv_poll_init_socket(uv_default_loop(), &(this->read_watcher), fd);
   uv_poll_init_socket(uv_default_loop(), &(this->write_watcher), fd);
 
+  PQsetNoticeProcessor(this->pq, NoticeProcessor, (void *) this);
+
   TRACE("Connection::ConnectSync::Success");
   return true;
 }
@@ -786,7 +788,11 @@ void Connection::DeleteCStringArray(char** array, int length) {
   delete [] array;
 }
 
-void Connection::Emit(const char* message) {
+void Connection::Emit(const char* event) {
+  this->EmitMessage(event, "");
+}
+
+void Connection::EmitMessage(const char* event, const char* message) {
   Nan::HandleScope scope;
 
   TRACE("ABOUT TO EMIT EVENT");
@@ -796,14 +802,19 @@ void Connection::Emit(const char* message) {
   assert(emit_v->IsFunction());
   v8::Local<v8::Function> emit_f = emit_v.As<v8::Function>();
 
-  v8::Local<v8::String> eventName = Nan::New<v8::String>(message).ToLocalChecked();
-  v8::Local<v8::Value> info[1] = { eventName };
+  v8::Local<v8::String> eventName = Nan::New<v8::String>(event).ToLocalChecked();
+  v8::Local<v8::String> eventMessage = Nan::New<v8::String>(message).ToLocalChecked();
+  v8::Local<v8::Value> info[2] = { eventName, eventMessage };
 
   TRACE("CALLING EMIT");
   Nan::TryCatch tc;
   Nan::AsyncResource *async_emit_f = new Nan::AsyncResource("libpq:connection:emit");
-  async_emit_f->runInAsyncScope(handle(), emit_f, 1, info);
+  async_emit_f->runInAsyncScope(handle(), emit_f, 2, info);
   if(tc.HasCaught()) {
     Nan::FatalException(tc);
   }
 }
+void Connection::NoticeProcessor(void *arg, const char *message)
+{
+  ((Connection *) arg)->EmitMessage("notice", message);
+}
diff --git a/src/connection.h b/src/connection.h
index d73b5e7..5776f12 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -76,7 +76,9 @@ class Connection : public Nan::ObjectWrap {
     static char* NewCString(v8::Local<v8::Value> val);
     static char** NewCStringArray(v8::Local<v8::Array> jsParams);
     static void DeleteCStringArray(char** array, int length);
-    void Emit(const char* message);
+    void Emit(const char* event);
+    void EmitMessage(const char* event, const char* message);
+    static void NoticeProcessor(void *arg, const char *message);
 };
 
 #endif
diff --git a/test/notice.js b/test/notice.js
new file mode 100644
index 0000000..943881a
--- /dev/null
+++ b/test/notice.js
@@ -0,0 +1,20 @@
+var PQ = require('../')
+var assert = require('assert');
+
+describe('server notices', function() {
+  it('works', function(done) {
+    var pq = new PQ();
+    pq.connect(function(err) {
+      assert.ifError(err);
+      notices = []
+      pq.on('notice', function(msg){notices.push(msg);});
+      pq.exec("SET SESSION client_min_messages=notice");
+      pq.exec("DO $$BEGIN RAISE NOTICE 'test1'; RAISE WARNING 'test2'; END;$$");
+      assert.equal(notices.length, 2);
+      assert.equal(notices[0], 'NOTICE:  test1\n');
+      assert.equal(notices[1], 'WARNING:  test2\n');
+      done();
+    });
+  });
+
+});