diff --git a/Cakefile b/Cakefile
index 904c9db4..f55cf842 100644
--- a/Cakefile
+++ b/Cakefile
@@ -15,9 +15,11 @@ task 'install', 'install CoffeeScript into /usr/local (or --prefix)', (options)
   exec([
     'mkdir -p ' + lib
     'cp -rf bin lib LICENSE README package.json src vendor ' + lib
-    'ln -sf ' + lib + '/lib/bin/coffee ' + base + '/bin/coffee'
-    'ln -sf ' + lib + '/lib/bin/cake ' + base + '/bin/cake'
-  ].join(' && '))
+    'ln -sf ' + lib + '/bin/coffee ' + base + '/bin/coffee'
+    'ln -sf ' + lib + '/bin/cake ' + base + '/bin/cake'
+  ].join(' && '), (err, stdout, stderr) ->
+   if err then print stderr
+  )
 
 
 task 'build', 'build the CoffeeScript language from source', ->
diff --git a/bin/cake b/bin/cake
index 49a86bcd..6c9f62ba 100755
--- a/bin/cake
+++ b/bin/cake
@@ -1,7 +1,15 @@
 #!/usr/bin/env node
 
 process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = null;
 
-require.paths.unshift(__dirname + '/../lib');
+if (fs.lstatSync(__filename).isSymbolicLink()) {
+  lib = path.join(path.dirname(fs.readlinkSync(__filename)), '../lib');
+} else {
+  lib = path.join(__dirname, '../lib');
+}
 
+require.paths.unshift(lib);
 require('cake').run();
diff --git a/bin/coffee b/bin/coffee
index 31561b8c..c556bbbc 100755
--- a/bin/coffee
+++ b/bin/coffee
@@ -1,7 +1,15 @@
 #!/usr/bin/env node
 
 process.mixin(require('sys'));
+var path = require('path');
+var fs = require('fs');
+var lib = null;
 
-require.paths.unshift(__dirname + '/../lib');
+if (fs.lstatSync(__filename).isSymbolicLink()) {
+  lib = path.join(path.dirname(fs.readlinkSync(__filename)), '../lib');
+} else {
+  lib = path.join(__dirname, '../lib');
+}
 
+require.paths.unshift(lib);
 require('command_line').run();
diff --git a/lib/bin/cake b/lib/bin/cake
deleted file mode 100755
index 524bdd16..00000000
--- a/lib/bin/cake
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-process.mixin(require('sys'));
-
-require.paths.unshift('/usr/local/lib/coffee-script/lib');
-
-require('cake').run();
diff --git a/lib/bin/coffee b/lib/bin/coffee
deleted file mode 100755
index e33e472b..00000000
--- a/lib/bin/coffee
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-process.mixin(require('sys'));
-
-require.paths.unshift('/usr/local/lib/coffee-script/lib');
-
-require('command_line').run();