diff --git a/install.sh b/install.sh
index 31197bb2c4..b357ba08be 100755
--- a/install.sh
+++ b/install.sh
@@ -130,6 +130,7 @@ ETC_DIRS="$ETC_LOCATION/im_kvm \
 LIB_DIRS="$LIB_LOCATION/im_probes \
           $LIB_LOCATION/ruby \
           $LIB_LOCATION/ruby/OpenNebula \
+          $LIB_LOCATION/ruby/econe \
           $LIB_LOCATION/tm_commands \
           $LIB_LOCATION/tm_commands/nfs \
           $LIB_LOCATION/tm_commands/ssh \
@@ -157,7 +158,7 @@ INSTALL_FILES[9]="DUMMY_TM_COMMANDS_LIB_FILES:$LIB_LOCATION/tm_commands/dummy"
 INSTALL_FILES[10]="EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples"
 INSTALL_FILES[11]="TM_EXAMPLE_SHARE_FILES:$SHARE_LOCATION/examples/tm"
 INSTALL_FILES[12]="HOOK_SHARE_FILES:$SHARE_LOCATION/hooks"
-INSTALL_FILES[13]="OCA_LIB_FILES:$LIB_LOCATION/ruby"
+INSTALL_FILES[13]="OCA_LIB_FILES:$LIB_LOCATION/ruby/econe"
 INSTALL_FILES[14]="OCA_BIN_FILES:$BIN_LOCATION"
 
 INSTALL_ETC_FILES[0]="ETC_FILES:$ETC_LOCATION"
@@ -385,9 +386,17 @@ HOOK_SHARE_FILES="share/hooks/ebtables-xen"
 
 OCA_LIB_FILES="src/oca/rm/image.rb \
                src/oca/rm/repo_manager.rb \
-               src/oca/ec2/OcaConfiguration.rb"
+               src/oca/ec2/OcaConfiguration.rb \
+               src/oca/ec2/eco.rb \
+               src/oca/ec2/lib/EC2QueryClient.rb"
 
-OCA_BIN_FILES="src/oca/ec2/eco.rb"
+OCA_BIN_FILES="src/oca/ec2/econe-server \
+               src/oca/ec2/econe-describe-images \
+               src/oca/ec2/econe-describe-instances \
+               src/oca/ec2/econe-register \
+               src/oca/ec2/econe-run-instances \
+               src/oca/ec2/econe-terminate-instances \
+               src/oca/ec2/econe-upload"
 
 OCA_ETC_FILES="src/oca/ec2/oca.conf"
 
diff --git a/src/oca/ec2/eco.rb b/src/oca/ec2/eco.rb
index 4da2996793..66aedc8738 100644
--- a/src/oca/ec2/eco.rb
+++ b/src/oca/ec2/eco.rb
@@ -11,6 +11,7 @@ else
 end
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 
 require 'rubygems'
diff --git a/src/oca/ec2/econe-describe-images b/src/oca/ec2/econe-describe-images
index 5b43f52314..1dead33894 100755
--- a/src/oca/ec2/econe-describe-images
+++ b/src/oca/ec2/econe-describe-images
@@ -52,6 +52,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'
diff --git a/src/oca/ec2/econe-describe-instances b/src/oca/ec2/econe-describe-instances
index d5adc65899..5103fc6d4d 100755
--- a/src/oca/ec2/econe-describe-instances
+++ b/src/oca/ec2/econe-describe-instances
@@ -52,6 +52,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'
diff --git a/src/oca/ec2/econe-register b/src/oca/ec2/econe-register
index dd1e00abb7..2aed2631d4 100755
--- a/src/oca/ec2/econe-register
+++ b/src/oca/ec2/econe-register
@@ -57,6 +57,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'
diff --git a/src/oca/ec2/econe-run-instances b/src/oca/ec2/econe-run-instances
index f2ef67981a..59b4e68520 100755
--- a/src/oca/ec2/econe-run-instances
+++ b/src/oca/ec2/econe-run-instances
@@ -54,6 +54,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'
diff --git a/src/oca/ec2/econe-server b/src/oca/ec2/econe-server
new file mode 100755
index 0000000000..94fd91e630
--- /dev/null
+++ b/src/oca/ec2/econe-server
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+nohup ruby $ONE_LOCATION/lib/ruby/econe/eco.rb >> $ONE_LOCATION/var/econe.log &
+
+
diff --git a/src/oca/ec2/econe-terminate-instances b/src/oca/ec2/econe-terminate-instances
index 8e9047c5a3..1b7c302077 100755
--- a/src/oca/ec2/econe-terminate-instances
+++ b/src/oca/ec2/econe-terminate-instances
@@ -53,6 +53,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'
diff --git a/src/oca/ec2/econe-upload b/src/oca/ec2/econe-upload
index 5dcc08c365..89bc9ad591 100755
--- a/src/oca/ec2/econe-upload
+++ b/src/oca/ec2/econe-upload
@@ -51,6 +51,7 @@ end
 
 
 $: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/econe"
 
 require 'EC2QueryClient'
 require 'getoptlong'