diff --git a/lib/tcp.js b/lib/tcp.js
index a27a32761a..64080be87b 100644
--- a/lib/tcp.js
+++ b/lib/tcp.js
@@ -1,26 +1,11 @@
-var tcp = process.binding('tcp');
+var net = require('net');
+var sys = require('sys');
 
-var TLS_STATUS_CODES = {
-  1 : 'JS_GNUTLS_CERT_VALIDATED',
-  0 : 'JS_GNUTLS_CERT_UNDEFINED',
+var warning;
+if (!warning) {
+  warning = "The 'tcp' module is now called 'net'. Otherwise it should have a similar interface.";
+  sys.error(warning);
 }
-TLS_STATUS_CODES[-100] = 'JS_GNUTLS_CERT_SIGNER_NOT_FOUND';
-TLS_STATUS_CODES[-101] = 'JS_GNUTLS_CERT_SIGNER_NOT_CA';
-TLS_STATUS_CODES[-102] = 'JS_GNUTLS_CERT_INVALID';
-TLS_STATUS_CODES[-103] = 'JS_GNUTLS_CERT_NOT_ACTIVATED';
-TLS_STATUS_CODES[-104] = 'JS_GNUTLS_CERT_EXPIRED';
-TLS_STATUS_CODES[-105] = 'JS_GNUTLS_CERT_REVOKED';
-TLS_STATUS_CODES[-106] = 'JS_GNUTLS_CERT_DOES_NOT_MATCH_HOSTNAME';
 
-exports.createServer = function (on_connection, options) {
-  var server = new tcp.Server();
-  server.addListener("connection", on_connection);
-  //server.setOptions(options);
-  return server;
-};
-
-exports.createConnection = function (port, host) {
-  var connection = new tcp.Connection();
-  connection.connect(port, host);
-  return connection;
-};
+exports.createServer = net.createServer;
+exports.createConnection = net.createConnection;
diff --git a/lib/tcp_old.js b/lib/tcp_old.js
new file mode 100644
index 0000000000..a27a32761a
--- /dev/null
+++ b/lib/tcp_old.js
@@ -0,0 +1,26 @@
+var tcp = process.binding('tcp');
+
+var TLS_STATUS_CODES = {
+  1 : 'JS_GNUTLS_CERT_VALIDATED',
+  0 : 'JS_GNUTLS_CERT_UNDEFINED',
+}
+TLS_STATUS_CODES[-100] = 'JS_GNUTLS_CERT_SIGNER_NOT_FOUND';
+TLS_STATUS_CODES[-101] = 'JS_GNUTLS_CERT_SIGNER_NOT_CA';
+TLS_STATUS_CODES[-102] = 'JS_GNUTLS_CERT_INVALID';
+TLS_STATUS_CODES[-103] = 'JS_GNUTLS_CERT_NOT_ACTIVATED';
+TLS_STATUS_CODES[-104] = 'JS_GNUTLS_CERT_EXPIRED';
+TLS_STATUS_CODES[-105] = 'JS_GNUTLS_CERT_REVOKED';
+TLS_STATUS_CODES[-106] = 'JS_GNUTLS_CERT_DOES_NOT_MATCH_HOSTNAME';
+
+exports.createServer = function (on_connection, options) {
+  var server = new tcp.Server();
+  server.addListener("connection", on_connection);
+  //server.setOptions(options);
+  return server;
+};
+
+exports.createConnection = function (port, host) {
+  var connection = new tcp.Connection();
+  connection.connect(port, host);
+  return connection;
+};
diff --git a/src/node.cc b/src/node.cc
index 5f98e7de7a..50fd399885 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1210,6 +1210,7 @@ static Handle<Value> Binding(const Arguments& args) {
       exports->Set(String::New("repl"),         String::New(native_repl));
       exports->Set(String::New("sys"),          String::New(native_sys));
       exports->Set(String::New("tcp"),          String::New(native_tcp));
+      exports->Set(String::New("tcp_old"),     String::New(native_tcp_old));
       exports->Set(String::New("uri"),          String::New(native_uri));
       exports->Set(String::New("url"),          String::New(native_url));
       exports->Set(String::New("utils"),        String::New(native_utils));