diff --git a/.travis.yml b/.travis.yml
index 907ee96d..3429d4d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.11"
 before_install:
   - sudo add-apt-repository ppa:lyrasis/precise-backports -y
   - sudo apt-get update -qq
diff --git a/package.json b/package.json
index f6675d9f..a1f78e7a 100755
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
   },
   "devDependencies": {
     "imagemagick": "^0.1.3",
-    "imagemagick-native": "^0.2.9",
+    "imagemagick-native": "git://github.com/mash/node-imagemagick-native.git#master",
     "gm": "^1.16.0",
     "async": "^0.8.0",
     "benchmark": "^1.0.0"
diff --git a/src/sharp.cc b/src/sharp.cc
index 1b4b437c..5c025fec 100755
--- a/src/sharp.cc
+++ b/src/sharp.cc
@@ -304,10 +304,10 @@ class ResizeWorker : public NanAsyncWorker {
   void HandleOKCallback () {
     NanScope();
 
-    Handle<Value> argv[2] = { Null(), Null() };
+    Handle<Value> argv[2] = { NanNull(), NanNull() };
     if (!baton->err.empty()) {
       // Error
-      argv[0] = String::New(baton->err.data(), baton->err.size());
+      argv[0] = NanNew<String>(baton->err.data(), baton->err.size());
     } else if (baton->buffer_out_len > 0) {
       // Buffer
       argv[1] = NanNewBufferHandle((char *)baton->buffer_out, baton->buffer_out_len);
@@ -335,12 +335,12 @@ NAN_METHOD(resize) {
   baton->width = args[3]->Int32Value();
   baton->height = args[4]->Int32Value();
   Local<String> canvas = args[5]->ToString();
-  if (canvas->Equals(String::NewSymbol("c"))) {
+  if (canvas->Equals(NanSymbol("c"))) {
     baton->crop = true;
-  } else if (canvas->Equals(String::NewSymbol("w"))) {
+  } else if (canvas->Equals(NanSymbol("w"))) {
     baton->crop = false;
     baton->extend = VIPS_EXTEND_WHITE;
-  } else if (canvas->Equals(String::NewSymbol("b"))) {
+  } else if (canvas->Equals(NanSymbol("b"))) {
     baton->crop = false;
     baton->extend = VIPS_EXTEND_BLACK;
   }
@@ -365,10 +365,10 @@ NAN_METHOD(cache) {
   }
 
   // Get cache statistics
-  Local<Object> cache = Object::New();
-  cache->Set(String::NewSymbol("current"), Number::New(vips_tracked_get_mem() / 1048576));
-  cache->Set(String::NewSymbol("high"), Number::New(vips_tracked_get_mem_highwater() / 1048576));
-  cache->Set(String::NewSymbol("limit"), Number::New(vips_cache_get_max_mem() / 1048576));
+  Local<Object> cache = NanNew<Object>();
+  cache->Set(NanSymbol("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
+  cache->Set(NanSymbol("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
+  cache->Set(NanSymbol("limit"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
   NanReturnValue(cache);
 }