diff --git a/src/node.cc b/src/node.cc
index 053d1db91a..95dc8be6ed 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1597,10 +1597,6 @@ static Handle<Value> Binding(const Arguments& args) {
     StatWatcher::Initialize(exports);
     File::Initialize(exports);
     binding_cache->Set(module, exports);
-  } else if (!strcmp(*module_v, "buffer")) {
-    exports = Object::New();
-    Buffer::Initialize(exports);
-    binding_cache->Set(module, exports);
   } else if (!strcmp(*module_v, "evals")) {
     exports = Object::New();
     node::Context::Initialize(exports);
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index b9717842e1..7d7e355406 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -549,3 +549,5 @@ void Buffer::Initialize(Handle<Object> target) {
 
 
 }  // namespace node
+
+NODE_MODULE(node_buffer, node::Buffer::Initialize);
diff --git a/src/node_extensions.h b/src/node_extensions.h
index 72e6871459..305c0ab97e 100644
--- a/src/node_extensions.h
+++ b/src/node_extensions.h
@@ -1,5 +1,6 @@
 
 NODE_EXT_LIST_START
+NODE_EXT_LIST_ITEM(node_buffer)
 NODE_EXT_LIST_ITEM(node_cares)
 NODE_EXT_LIST_ITEM(node_child_process)
 #ifdef HAVE_OPENSSL