--- a/specs/stx-jv.rbspec	Mon Dec 12 22:43:48 2016 +0000
+++ b/specs/stx-jv.rbspec	Tue Dec 13 13:33:24 2016 +0000
@@ -42,6 +42,25 @@
   # applications that needs some JV-branch features.
   import :'stx:baseline'
 
+  # FORKED STC and librun
+  package "stx:stc", :repository => :'swing:private:hg', :branch => 'jv', :checkout => (Proc.new do | pkg |
+    # Download pre-compiled binary if user has no access to source code    
+    if Rake::Stx::Configuration::Repository::find(pkg.repository) then
+        checkout pkg.repository, 'stx/stc', :branch => pkg.branch
+    else
+        download_blob_matching(/prebuilt-stc/, BUILD_DIR / 'stx')
+    end
+  end)
+
+  package "stx:librun", :repository => :'swing:private:hg', :branch => 'jv', :checkout => (Proc.new do | pkg |
+    # Download pre-compiled binary if user has no access to source code
+    if Rake::Stx::Configuration::Repository::find(pkg.repository) then
+        checkout pkg.repository, 'stx/librun', :branch => pkg.branch
+    else
+        download_blob_matching(/prebuilt-librun/, BUILD_DIR / 'stx')
+    end
+  end)
+
   # FORKED libraries
   # ======================================================================
   package "stx:libbasic", :repository => :'bitbucket:janvrany', :branch => 'jv'
@@ -82,22 +101,6 @@
       end
     end
 
-    redefine BUILD_DIR / 'stx' / 'stc' => BUILD_DIR do
-      if Rake::Stx::Configuration::Repository::find(:'swing:private:hg') then
-        checkout :'swing:private:hg', 'stx/stc', :branch => 'jv'
-      else
-        download_blob_matching(/prebuilt-stc/, BUILD_DIR / 'stx')
-      end
-    end
-
-    redefine BUILD_DIR / 'stx' / 'librun' => BUILD_DIR do      
-      if Rake::Stx::Configuration::Repository::find(:'swing:private:hg') then
-        checkout :'swing:private:hg', 'stx/librun', :branch => 'jv'
-      else        
-        download_blob_matching(/prebuilt-librun/, BUILD_DIR / 'stx')
-      end
-    end
-
     # Try execute run the VM if it starts up
     task :'compile:post' do
       if PROJECT == 'stx:jv-branch' then