diff --git a/tools/wscript b/tools/wscript
index bea6079..7561edb 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -8,14 +8,15 @@
     for app in bld.path.ant_glob('**/*', dir=True):
         if os.path.isdir(app.abspath()):
             bld(features=['cxx', 'cxxprogram'],
-                target = '../bin/%s' % (str(app)),
+                target = '../bin/%s' % app.path_from(bld.path),
                 source = app.ant_glob(['**/*.cpp']),
                 use = 'ndns-objects',
                 )
 
     for app in bld.path.ant_glob('**/*.cpp'):
+        name = app.path_from(bld.path)[:-len(".cpp")]
         bld(features=['cxx', 'cxxprogram'],
-            target = '../bin/%s' % (str(app.change_ext('','.cpp'))),
+            target = '../bin/%s' % name,
             source = app,
             use = 'ndns-objects',
             )