diff --git a/toolchain-m68k b/toolchain-m68k
index f6e1666..ea4fea2 100755
--- a/toolchain-m68k
+++ b/toolchain-m68k
@@ -65,9 +65,6 @@ def prepare_target():
           'os-include/lvo', 'os-lib', 'os-lib/fd', 'os-lib/sfd',
           'vbcc-include', 'vbcc-lib')
 
-  with cwd('{target}/m68k-amigaos'):
-    symlink('../lib', 'lib')
-
 
 @recipe('{NDK}-install')
 def install_ndk():
@@ -110,14 +107,14 @@ def install_tools():
 def install_libamiga():
   info('installing libamiga')
 
-  copytree('{sources}/libamiga/lib', '{target}/lib')
+  copytree('{sources}/libamiga/lib', '{target}/m68k-amigaos/lib')
 
 
 @recipe('clib2-install')
 def install_clib2():
   info('installing clib2')
 
-  with cwd('{target}/m68k-amigaos/clib2'):
+  with cwd('{target}/clib2'):
     copytree('{build}/clib2/lib', 'lib')
     copytree('{build}/clib2/include', 'include')
 
@@ -373,7 +370,7 @@ def build():
 
   unpack('libnix')
   configure('libnix',
-            '--prefix={target}',
+            '--prefix={target}/m68k-amigaos',
             '--host=i686-linux-gnu',
             '--target=m68k-amigaos')
   make('libnix',
@@ -397,7 +394,7 @@ def build():
            AR='m68k-amigaos-ar',
            RANLIB='m68k-amigaos-ranlib'):
     configure('{libm}',
-              '--prefix={target}',
+              '--prefix={target}/m68k-amigaos',
               '--host=i686-linux-gnu',
               '--target=m68k-amigaos')
   make('{libm}')
@@ -408,7 +405,7 @@ def build():
            AR='m68k-amigaos-ar',
            RANLIB='m68k-amigaos-ranlib'):
     configure('{libdebug}',
-              '--prefix={target}',
+              '--prefix={target}/m68k-amigaos',
               '--host=m68k-amigaos')
   make('{libdebug}')
   make('{libdebug}', 'install')
@@ -471,7 +468,7 @@ def add_stubs(src):
   obj = re.sub(r'\.c$', r'.o', src)
 
   for libdir, cflags in MULTILIB:
-    lib = path.join('{target}/lib', libdir, 'libnix/libstubs.a')
+    lib = path.join('{target}/m68k-amigaos/lib', libdir, 'libnix/libstubs.a')
     info('stubs: "%s" -> "%s"', obj, lib)
     cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src]
     execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags)
@@ -483,7 +480,7 @@ def add_lib(src, libname):
   obj = re.sub(r'\.a$', r'.o', libname)
 
   for libdir, cflags in MULTILIB:
-    lib = path.join('{target}/lib', libdir, libname)
+    lib = path.join('{target}/m68k-amigaos/lib', libdir, libname)
     info('lib: "%s" -> "%s"', obj, lib)
     cflags = list(cflags) + ['-noixemul', '-c', '-o', obj, src]
     execute('m68k-amigaos-gcc', '-Wall', '-O3', '-fomit-frame-pointer', *cflags)