diff --git a/eclipse-fix-sshd-id.patch b/eclipse-fix-sshd-id.patch
new file mode 100644
index 0000000..5e07d02
--- /dev/null
+++ b/eclipse-fix-sshd-id.patch
@@ -0,0 +1,19 @@
+--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-07-26 16:19:46.000000000 +0200
++++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-07-26 16:30:47.114019486 +0200
+@@ -377,7 +377,7 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.sshd.core"
++         id="sshd-core"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+--- rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF.bak	2012-07-26 16:40:00.000000000 +0200
++++ rt.equinox.incubator/console/org.eclipse.equinox.console.jaas.fragment/META-INF/MANIFEST.MF	2012-07-26 16:40:17.896441807 +0200
+@@ -5,4 +5,4 @@
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ DynamicImport-Package: org.eclipse.equinox.console.jaas
+-Fragment-Host: org.apache.sshd.core;bundle-version="0.5.0"
++Fragment-Host: sshd-core
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
new file mode 100644
index 0000000..a8eb748
--- /dev/null
+++ b/eclipse-no-source-for-dependencies.patch
@@ -0,0 +1,429 @@
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties.orig	2012-03-27 16:28:35.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/sourceTemplateFeature/build.properties	2012-03-30 09:03:43.205386499 +0200
+@@ -31,6 +31,4 @@
+            plugin@org.eclipse.ecf.provider.filetransfer.source;version=3.2.0.qualifier;unpack="false",\
+            plugin@org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
+            plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source;version=4.0.200.qualifier;unpack="false",\
+-           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+-           plugin@org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
+-           plugin@org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
+\ No newline at end of file
++           plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
+\ No newline at end of file
+--- eclipse.platform.releng/features/org.eclipse.sdk/build.properties.orig	2012-04-06 11:35:38.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.sdk/build.properties	2012-04-06 13:02:22.997174313 +0200
+@@ -11,33 +11,12 @@
+ bin.includes=eclipse_update_120.jpg,feature.xml,feature.properties
+ 
+ generate.feature@org.eclipse.platform.source=org.eclipse.platform,feature@org.eclipse.rcp.source,feature@org.eclipse.equinox.p2.user.ui.source;optional="true",plugin@org.eclipse.platform.doc.isv;unpack="false",\
+-  plugin@org.apache.ant.source;version=1.8.3.qualifier;unpack="false",\
+-  plugin@com.jcraft.jsch.source;version=0.1.46.qualifier;unpack="false",\
+   exclude@org.eclipse.platform.doc.user
+    
+ generate.feature@org.eclipse.jdt.source=org.eclipse.jdt, plugin@org.eclipse.jdt.doc.isv;unpack="false",\
+-plugin@org.junit.source;version=3.8.2.qualifier;unpack="false",\
+-plugin@org.junit.source;version=4.10.0.qualifier;unpack="false",\
+-plugin@org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
+ exclude@org.eclipse.jdt.doc.user
+ generate.feature@org.eclipse.pde.source=org.eclipse.pde,plugin@org.objectweb.asm.source;version=3.3.1.qualifier;unpack="false",\exclude@org.eclipse.pde.doc.user
+ generate.feature@org.eclipse.cvs.source=org.eclipse.cvs
+-generate.feature@org.eclipse.help.source=org.eclipse.help,\
+-  plugin@javax.servlet.source;version=3.0.0.qualifier;unpack="false",\
+-  plugin@javax.servlet.jsp.source;version=2.2.0.qualifier;unpack="false",\
+-  plugin@org.apache.jasper.glassfish.source;version=2.2.2.qualifier;unpack="false",\
+-  plugin@com.sun.el.source;version=2.2.0.qualifier;unpack="false",\
+-  plugin@org.apache.commons.logging.source;version=1.0.4.qualifier;unpack="false",\
+-  plugin@org.apache.lucene.source;version=2.9.1.qualifier;unpack="false",\
+-  plugin@org.apache.lucene.analysis.source;version=2.9.1.qualifier;unpack="false",\
+-  plugin@org.apache.lucene.core.source;version=2.9.1.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.continuation.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.http.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.io.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.security.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.server.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.servlet.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@org.eclipse.jetty.util.source;version=8.1.3.qualifier;unpack="false",\
+-  plugin@javax.el.source;version=2.2.0.qualifier;unpack="false"
++generate.feature@org.eclipse.help.source=org.eclipse.help
+ 
+ generatedVersionLength=45
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml.bak	2012-07-25 17:45:43.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/feature.xml	2012-07-26 15:53:52.708568166 +0200
+@@ -31,13 +31,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.commons.codec.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.commons.httpclient"
+          download-size="0"
+          install-size="0"
+@@ -45,13 +38,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.commons.httpclient.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.commons.logging"
+          download-size="0"
+          install-size="0"
+@@ -59,13 +45,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.commons.logging.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.p2.artifact.repository"
+          download-size="0"
+          install-size="0"
+@@ -458,13 +437,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.filetransfer.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.ecf.identity"
+          download-size="0"
+          install-size="0"
+@@ -472,13 +444,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.identity.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.ecf.provider.filetransfer"
+          download-size="0"
+          install-size="0"
+@@ -493,13 +458,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.provider.filetransfer.httpclient.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl"
+          download-size="0"
+          install-size="0"
+@@ -508,20 +466,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.ecf.provider.filetransfer.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.ecf.provider.filetransfer.ssl"
+          download-size="0"
+          install-size="0"
+@@ -530,20 +474,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.provider.filetransfer.ssl.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.ecf.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.ecf.ssl"
+          download-size="0"
+          install-size="0"
+@@ -552,13 +482,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.eclipse.ecf.ssl.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.eclipse.equinox.simpleconfigurator"
+          download-size="0"
+          install-size="0"
+--- rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties.bak	2012-07-25 17:45:43.000000000 +0200
++++ rt.equinox.p2/features/org.eclipse.equinox.p2.sdk/build.properties	2012-07-26 15:52:00.768876554 +0200
+@@ -11,17 +11,6 @@
+ ###############################################################################
+ bin.includes = feature.xml,feature.properties
+ 
+-generate.plugin@org.apache.commons.codec.source=org.apache.commons.codec
+-generate.plugin@org.apache.commons.httpclient.source=org.apache.commons.httpclient
+-generate.plugin@org.apache.commons.logging.source=org.apache.commons.logging
+-generate.plugin@org.eclipse.ecf.filetransfer.source=org.eclipse.ecf.filetransfer
+-generate.plugin@org.eclipse.ecf.identity.source=org.eclipse.ecf.identity
+-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.source=org.eclipse.ecf.provider.filetransfer.httpclient
+-generate.plugin@org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source=org.eclipse.ecf.provider.filetransfer.httpclient.ssl
+-generate.plugin@org.eclipse.ecf.provider.filetransfer.source=org.eclipse.ecf.provider.filetransfer
+-generate.plugin@org.eclipse.ecf.provider.filetransfer.ssl.source=org.eclipse.ecf.provider.filetransfer.ssl
+-generate.plugin@org.eclipse.ecf.source=org.eclipse.ecf
+-generate.plugin@org.eclipse.ecf.ssl.source=org.eclipse.ecf.ssl
+ generate.plugin@org.eclipse.equinox.frameworkadmin.equinox.source=org.eclipse.equinox.frameworkadmin.equinox
+ generate.plugin@org.eclipse.equinox.frameworkadmin.source=org.eclipse.equinox.frameworkadmin
+ generate.plugin@org.eclipse.equinox.p2.artifact.repository.source=org.eclipse.equinox.p2.artifact.repository
+--- rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml.bak	2012-07-25 17:42:07.000000000 +0200
++++ rt.equinox.framework/features/org.eclipse.equinox.core.sdk/feature.xml	2012-07-26 16:18:17.122501404 +0200
+@@ -356,13 +356,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.felix.gogo.command.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.felix.gogo.runtime"
+          download-size="0"
+          install-size="0"
+@@ -370,13 +363,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.felix.gogo.runtime.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.felix.gogo.shell"
+          download-size="0"
+          install-size="0"
+@@ -384,13 +370,6 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.felix.gogo.shell.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.mina.core"
+          download-size="0"
+          install-size="0"
+@@ -398,24 +377,10 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="org.apache.mina.core.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="org.apache.sshd.core"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.apache.sshd.core.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
+--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.bak	2012-07-26 16:59:32.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-07-26 17:19:45.402836242 +0200
+@@ -50,32 +50,11 @@
+          unpack="false"/>
+ 
+    <plugin
+-         id="javax.servlet.jsp.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="javax.servlet.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+          id="javax.el"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+-
+-   <plugin
+-         id="javax.el.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/> 
+          
+    <plugin
+          id="org.eclipse.equinox.http.jetty"
+@@ -165,13 +144,6 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/> 
+-
+-   <plugin
+-         id="org.apache.jasper.glassfish.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+          
+     <plugin
+@@ -179,28 +151,14 @@
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>   
+-    
+-     <plugin
+-         id="org.eclipse.jetty.continuation.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>   
++         unpack="false"/> 
+     
+      <plugin
+          id="org.eclipse.jetty.http"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>   
+-
+-     <plugin
+-         id="org.eclipse.jetty.http.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>   
++         unpack="false"/>
+ 
+     
+      <plugin
+@@ -210,13 +168,6 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-     <plugin
+-         id="org.eclipse.jetty.io.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+     
+     <plugin
+          id="org.eclipse.jetty.security"
+@@ -226,28 +177,12 @@
+          unpack="false"/>
+ 
+     <plugin
+-         id="org.eclipse.jetty.security.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-
+-    <plugin
+          id="org.eclipse.jetty.server"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
+ 
+-    <plugin
+-         id="org.eclipse.jetty.server.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+-
+    <plugin
+          id="org.eclipse.jetty.servlet"
+          download-size="0"
+@@ -255,25 +190,11 @@
+          version="0.0.0"
+          unpack="false"/>
+ 
+-  <plugin
+-         id="org.eclipse.jetty.servlet.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+-         unpack="false"/>
+-
+    <plugin
+          id="org.eclipse.jetty.util"
+          download-size="0"
+          install-size="0"
+          version="0.0.0"
+-         unpack="false"/>
+-
+-   <plugin
+-         id="org.eclipse.jetty.util.source"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"
+          unpack="false"/>
+ 
+    <plugin
diff --git a/eclipse-osgi-serverside-patch-additional-imports.patch b/eclipse-osgi-serverside-patch-additional-imports.patch
new file mode 100644
index 0000000..6b99f6d
--- /dev/null
+++ b/eclipse-osgi-serverside-patch-additional-imports.patch
@@ -0,0 +1,25 @@
+--- rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml.old	2012-01-14 12:38:46.714594091 +0100
++++ rt.equinox.bundles/features/org.eclipse.equinox.serverside.sdk/feature.xml	2012-01-14 12:39:04.959639056 +0100
+@@ -152,6 +152,21 @@
+          install-size="0"
+          version="0.0.0"
+          unpack="false"/>
++
++  <plugin
++         id="org.apache.jasper"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/> 
++
++  <plugin
++         id="org.apache.commons.el"
++         download-size="0"
++         install-size="0"
++         version="0.0.0"
++         unpack="false"/> 
++
+    <plugin
+          id="org.apache.jasper.glassfish.source"
+          download-size="0"
+
diff --git a/eclipse-set-1.6-bree.patch b/eclipse-set-1.6-bree.patch
index 311c2be..4efcf4f 100644
--- a/eclipse-set-1.6-bree.patch
+++ b/eclipse-set-1.6-bree.patch
@@ -9,3 +9,14 @@
  
            <environments>
              <environment>
+--- rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml.bak	2012-07-25 17:41:27.000000000 +0200
++++ rt.equinox.bundles/features/org.eclipse.equinox.sdk/pom.xml	2012-07-26 16:57:26.571579035 +0200
+@@ -31,7 +31,7 @@
+         <artifactId>target-platform-configuration</artifactId>
+         <configuration>
+           <!-- J2SE-1.5 is the minimum version required for javax.security.sasl required by this bundle. -->
+-          <executionEnvironment>J2SE-1.5</executionEnvironment>
++          <executionEnvironment>?JavaSE-1.6</executionEnvironment>
+         </configuration>
+       </plugin>
+     </plugins>
diff --git a/eclipse.spec b/eclipse.spec
index 555ab88..9495b4f 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -62,6 +62,9 @@ Patch2:         %{name}-set-1.6-bree.patch
 # com.ibm.icu.base -> com.ibm.icu
 Patch3:         %{name}-fix-icu-import.patch
 
+Patch4:         %{name}-no-source-for-dependencies.patch
+Patch5:         %{name}-osgi-serverside-patch-additional-imports.patch
+Patch6:         %{name}-fix-sshd-id.patch
 
 BuildRequires:  ant >= 1.8.3
 BuildRequires:  rsync
@@ -92,6 +95,7 @@ BuildRequires: jsch >= 0:0.1.46-2
 BuildRequires: apache-commons-el >= 1.0-22
 BuildRequires: apache-commons-logging
 BuildRequires: apache-commons-codec >= 1.6-2
+BuildRequires: apache-sshd
 BuildRequires: jakarta-commons-httpclient >= 1:3.1-7
 BuildRequires: felix-gogo-command >= 0.12
 BuildRequires: felix-gogo-shell >= 0.10.0-3
@@ -239,6 +243,9 @@ developing Eclipse plugins.
 %patch1
 %patch2
 %patch3
+%patch4
+%patch5
+%patch6
 
 #TODO: waiting for bug
 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .