diff --git a/CodenameOne/build.xml b/CodenameOne/build.xml
index cbfb0f9098..3d2ccca884 100644
--- a/CodenameOne/build.xml
+++ b/CodenameOne/build.xml
@@ -594,15 +594,28 @@
         <zip basedir="${codenameone.dir}/NBPlugin/CodenameOneSuite/build/updates" includes="*.nbm" file="../nightly_builds/CodenameOne_NetBeansPlugin_${tstamp}.zip" />
 
         <property name="ideaplugin" location="${codenameone.dir}/IntelliJCodenameOneSupport/resources"/>
+        <property name="eclipseplugin" location="${codenameone.dir}/Eclipse/workspace"/>
         <copy file="${codenameone.dir}/BuildClient/dist/CodenameOneBuildClient.jar"
             tofile="${ideaplugin}/files/CodeNameOneBuildClient.jar" />
+
+        <copy file="${codenameone.dir}/BuildClient/dist/CodenameOneBuildClient.jar"
+        tofile="${eclipseplugin}/CodenameOnePlugin/src/CodenameOneTemplate/CodeNameOneBuildClient.jar" />
+
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/CodenameOneLibrary.zip"
-            tofile="${ideaplugin}/files/CodenameOneLibrary.zip" />
+        tofile="${ideaplugin}/files/CodenameOneLibrary.zip" />        
+        
         <copy file="../CodenameOneDesigner/dist/designer.jar"
             tofile="${ideaplugin}/files/designer.jar" />
+
+        <copy file="../CodenameOneDesigner/dist/designer.jar"
+            tofile="${eclipseplugin}/CodenameOnePlugin/src/codenameoneplugin/designer.jar" />
+                
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/guibuilder.jar"
             tofile="${ideaplugin}/files/guibuilder.jar" />
 
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/guibuilder.jar"
+            tofile="${eclipseplugin}/CodenameOnePlugin/src/codenameoneplugin/guibuilder.jar" />
+
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/camera/CameraDemoProject.zip"
             tofile="${ideaplugin}/files/CameraDemoProject.zip" />
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/charts/ChartsProject.zip"
@@ -627,7 +640,6 @@
             tofile="${ideaplugin}/files/SocialBooProject.zip" />
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/sql/SQLSampleProject.zip"
             tofile="${ideaplugin}/files/SQLSampleProject.zip" />
-
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/CleanModernDemoProject.zip"
             todir="${ideaplugin}/files" />
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/DeviceTesterDemoProject.zip"
@@ -640,11 +652,51 @@
             todir="${ideaplugin}/files" />
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/SwiftnotesDemoProject.zip"
             todir="${ideaplugin}/files" />
-                                        
+
         
+                                                       
         <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/CodenameOneProject.zip"
             tofile="${ideaplugin}/templates/CodenameOneProject.zip" />
 
+        
+        
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/camera/CameraDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/charts/ChartsProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/chrome/ChromeProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/poker/CN1PokerProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/drsbaitso/DrSbaitsoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/flickr/FlickrProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/kitchen/KitchenSinkProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/maps/MapsDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/nativedemo/NativeDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/propertycross/PropertyCrossProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/socialboo/SocialBooProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/sql/SQLSampleProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/CleanModernDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/DeviceTesterDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/MaterialScreensDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/PhoenixDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/PsdToAppTutorialDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        <copy file="${nbplugin}/CodenameOnePlugin/src/com/codename1/demos/gendemo/SwiftnotesDemoProject.zip"
+            todir="${eclipseplugin}/CodenameOnePlugin/src/demos/" />
+        
 
         <!-- Windows Version -->
         <!-- zip basedir="../CodenameOneDesigner/" includes="designer.exe" file="../nightly_builds/CodenameOneDesignerWindows_${tstamp}.zip" / -->