diff --git a/jbpm-installer/build.properties b/jbpm-installer/build.properties
index 271c63d0b1..3061f41ac3 100644
--- a/jbpm-installer/build.properties
+++ b/jbpm-installer/build.properties
@@ -9,18 +9,18 @@ jBPM.url=http://hudson.jboss.org/jenkins/job/jBPM/lastSuccessfulBuild/artifact/j
 # the version of Drools Eclipse plugin you want to use
 # and the associated URL you want to get the dependencies from
 # for example: 
-#   drools.eclipse.version=5.2.0.Final
-#   drools.eclipse.url=https://repository.jboss.org/nexus/content/repositories/releases/org/drools/org.drools.updatesite/5.2.0.Final/org.drools.updatesite-5.2.0.Final-assembly.zip
-drools.eclipse.version=5.2.0.Final
-drools.eclipse.url=https://repository.jboss.org/nexus/content/repositories/releases/org/drools/org.drools.updatesite/5.2.0.Final/org.drools.updatesite-5.2.0.Final-assembly.zip
+#   drools.eclipse.version=5.3.1-SNAPSHOT
+#   drools.eclipse.url=https://repository.jboss.org/nexus/content/repositories/snapshots/org/drools/org.drools.updatesite/5.3.1-SNAPSHOT/org.drools.updatesite-5.3.1-20111110.095522-32-assembly.zip
+drools.eclipse.version=5.3.1-SNAPSHOT
+drools.eclipse.url=https://repository.jboss.org/nexus/content/repositories/snapshots/org/drools/org.drools.updatesite/5.3.1-SNAPSHOT/org.drools.updatesite-5.3.1-20111110.095522-32-assembly.zip
 
 # the version of Drools Guvnor you want to use
 # and the associated URL you want to get the dependencies from
 # for example: 
-#   drools.guvnor.version=5.2.0.Final
-#   drools.guvnor.url=https://repository.jboss.org/nexus/content/repositories/releases/org/drools/guvnor-distribution-wars/5.2.0.Final/guvnor-distribution-wars-5.2.0.Final-jboss-as-5.1.war
-drools.guvnor.version=5.2.0.Final
-drools.guvnor.url=https://repository.jboss.org/nexus/content/repositories/releases/org/drools/guvnor-distribution-wars/5.2.0.Final/guvnor-distribution-wars-5.2.0.Final-jboss-as-5.1.war
+#   drools.guvnor.version=5.3.1-SNAPSHOT
+#   drools.guvnor.url=https://repository.jboss.org/nexus/content/repositories/snapshots/org/drools/guvnor-distribution-wars/5.3.1-SNAPSHOT/guvnor-distribution-wars-5.3.1-20111110.093610-32-jboss-as-5.1.war
+drools.guvnor.version=5.3.1-SNAPSHOT
+drools.guvnor.url=https://repository.jboss.org/nexus/content/repositories/snapshots/org/drools/guvnor-distribution-wars/5.3.1-SNAPSHOT/guvnor-distribution-wars-5.3.1-20111110.093610-32-jboss-as-5.1.war
 
 # the version of the Designer you want to use
 # and the associated URL you want to get it from
diff --git a/jbpm-installer/build.xml b/jbpm-installer/build.xml
index 8c104c41ab..d9aad6d88f 100644
--- a/jbpm-installer/build.xml
+++ b/jbpm-installer/build.xml
@@ -197,22 +197,7 @@
     <get src="${designer.url}/designer-${designer.version}.war" dest="${install.home}/lib/designer-${designer.version}.war"  />
   </target>
 
-  <!-- Download jBPM Eclipse plugins -->
-  <target name="download.jBPM.eclipse.check">
-    <echo message="Checking jBPM Eclipse download ..." />
-    <condition property="jBPM.eclipse.not.available">
-      <not>
-        <available file="${install.home}/lib/jbpm-${jBPM.version}-eclipse-all.zip" />
-      </not>
-    </condition>
-  </target>
-  <target name="download.jBPM.eclipse" depends="download.jBPM.eclipse.check" if="jBPM.eclipse.not.available">
-    <echo message="Getting jBPM Eclipse ..." />
-    <mkdir dir="${install.home}/lib"/>
-    <get src="http://sourceforge.net/projects/jbpm/files/jBPM%205/jbpm-5.1.0.Final/jbpm-5.1.0.Final-eclipse-all.zip/download" dest="${install.home}/lib/jbpm-${jBPM.version}-eclipse-all.zip"  />
-  </target>
-
-  <!-- Download Drools Eclipse plugins -->
+  <!-- Download jBPM & Drools Eclipse plugins -->
   <target name="download.drools.eclipse.check">
     <echo message="Checking Drools Eclipse download ..." />
     <condition property="drools.eclipse.not.available">
@@ -385,12 +370,6 @@
     <unzip src="${install.home}/lib/jbpm-${jBPM.version}-bin.zip" dest="${install.home}/runtime" />
   </target>
 
-  <!-- Install Eclipse plugins -->
-  <target name="install.jBPM-eclipse.into.eclipse" depends="download.jBPM.eclipse">
-    <!-- install plugins -->
-    <unzip src="${install.home}/lib/jbpm-${jBPM.version}-eclipse-all.zip" dest="${eclipse.home}" />
-  </target>
-
   <!-- Install Eclipse plugins -->
   <target name="install.drools-eclipse.into.eclipse" depends="download.drools.eclipse">
     <!-- install plugins -->
@@ -406,7 +385,7 @@
   </target>
 
   <!-- Install Demo -->
-  <target name="install.demo" depends="install.jboss,install.guvnor.into.jboss,install.designer.into.jboss,install.jBPM-gwt-console.into.jboss,install.eclipse,install.jBPM-eclipse.into.eclipse,install.jBPM.runtime,install.drools-eclipse.into.eclipse" />
+  <target name="install.demo" depends="install.jboss,install.guvnor.into.jboss,install.designer.into.jboss,install.jBPM-gwt-console.into.jboss,install.eclipse,install.jBPM.runtime,install.drools-eclipse.into.eclipse" />
   
   <!-- Install Demo (No Eclipse) -->
   <target name="install.demo.noeclipse" depends="install.jboss,install.guvnor.into.jboss,install.designer.into.jboss,install.jBPM-gwt-console.into.jboss,install.jBPM.runtime" />
diff --git a/jbpm-installer/eclipse.preferences.ini b/jbpm-installer/eclipse.preferences.ini
index 492001d571..38399df9a1 100644
--- a/jbpm-installer/eclipse.preferences.ini
+++ b/jbpm-installer/eclipse.preferences.ini
@@ -1 +1 @@
-org.jboss.tools.jbpm/jBPM.Runtimes=jBPM runtime#./runtime#true# 
+org.jbpm.eclipse/jBPM.Runtimes=jBPM runtime#./runtime#true# 
diff --git a/jbpm-installer/generate.mac.eclipse.preferences.sh b/jbpm-installer/generate.mac.eclipse.preferences.sh
old mode 100644
new mode 100755
index 48610a92c6..b51ea4bb5b
--- a/jbpm-installer/generate.mac.eclipse.preferences.sh
+++ b/jbpm-installer/generate.mac.eclipse.preferences.sh
@@ -1 +1 @@
-echo org.jboss.tools.jbpm/jBPM.Runtimes=jBPM runtime#`pwd`/runtime#true# > mac.eclipse.preferences.ini
\ No newline at end of file
+echo org.jbpm.eclipse/jBPM.Runtimes=jBPM runtime#`pwd`/runtime#true# > mac.eclipse.preferences.ini
\ No newline at end of file