diff --git a/.gitignore b/.gitignore
index 70481c40..86d2e7d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,5 @@
 *.swp
 *.tar.gz
 .sconsign.dblite
-ocarina.bin
+bin/
 include/version.h
-test_*
diff --git a/Sconstruct b/Sconstruct
index c7b4576d..75478a4f 100644
--- a/Sconstruct
+++ b/Sconstruct
@@ -35,9 +35,14 @@ def directory(dirs):
 		objs.append(files)
 	return objs
 
+def symlink(target, source, env):
+	import os
+	os.symlink(str(source[0]), str(target[0]))
+
 SConscript(['include/Sconscript'])
-ocarina=env.Program('ocarina.bin', directory(["libsaria", "ocarina"]))
-Default([ocarina])
+ocarina = env.Program('bin/ocarina-player', directory(["libsaria", "ocarina"]))
+oc_link = env.Command("ocarina.bin", "bin/ocarina-player", symlink)
+Default([ocarina, oc_link])
 
 # Install Ocarina
 scripts = os.listdir("scripts/")