--- a/specs/stx-jv.rbspec	Mon May 23 19:46:10 2016 +0100
+++ b/specs/stx-jv.rbspec	Mon May 23 22:31:14 2016 +0100
@@ -289,8 +289,6 @@
 
   #package "stx:goodies/builder/reports", :repository => :'swing:baseline', :link => false
 
-
-
   tasks do
     task "stx:projects/smalltalk" => "stx:libwebkit"
     task "stx:projects/smalltalk" => "stx:libjava"
@@ -307,20 +305,17 @@
     task 'stx:projects/smalltalk' => 'stx:goodies/ring'
     task 'stx:projects/smalltalk' => 'stx:goodies/libcairo'
     task "stx:goodies/builder/reports" => 'stx:libbasic'
-
-    task :'dist:main' => :'dist:build-tree'
-    task :'dist:main' => :'dist:jv-branch'
-
-
+  
+    task :'install:main' => :'dist:jv-branch'
 
     task :'dist:jv:pre' => :'stx:jv-branch:extractver'
 
     if win32?     	
-			app_name    = project.app_name      || (raise Exception.new("No app_name property specified"))
+      app_name    = project.app_name      || (raise Exception.new("No app_name property specified"))
 	    app_version = project.app_version   || (raise Exception.new("No app_version property specified"))
 	    version = app_version.split('_').first
 
-	    install_dir = DIST_DIR / 'dist' / "#{app_name}-#{app_version}_#{ARCH}-#{PLATFORM}"
+	    install_dir = ARTIFACTS_DIR / BUILD_NAME
 	    bin_dir = install_dir / 'bin'
 
 	    cairo_dll_dir = nil
@@ -360,16 +355,15 @@
     	end
     end
 
-    task :'dist:jv-branch' => [ :'dist:jv:all',
-                                :'dist:jv:archive',
-                                # Documentation
-                                :'dist:jv:doc' ,
-                                :'dist:jv:archive-doc' ]
+    task :'dist:jv-branch' => [ :'dist:jv:all',                                                          
+                                :'dist:jv:doc' ]
 
+    task :'install:main' => [:'stx:jv-branch:extractver']
+    task :'artifacts:main' => [:'stx:jv-branch:extractver']
   end
 end
 
-task :'stx:jv-branch:extractver' do
+task :'stx:jv-branch:extractver' => :'setup' do
   ver = nil
   if win32?
     stx_exe = 'stx.com'
@@ -384,6 +378,8 @@
   end
   ver = (ver.split(".")[0..2]).join(".")
   project.app_version "#{ver}_#{build_id}"
+  # This is really ugly. We need to clean that up...
+  BUILD_NAME.replace "#{project.app_name}-#{project.app_version}_#{ARCH}-#{win32? ? 'win32' : RbConfig::CONFIG['host_os']}"
 end
 
 
@@ -400,9 +396,8 @@
          end
       end
     end
-
-    clear :'dist:main' => :'dist:build-tree'
-    clear :'dist:main' => :'dist:jv-branch'
+    
+    clear :'dist:install' => :'dist:jv-branch'
   end
 end