diff --git a/assembly/pom.xml b/assembly/pom.xml
index 3c87009203..38cbf6cf1b 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -135,6 +135,10 @@
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-beanutils</groupId>
       <artifactId>commons-beanutils</artifactId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 24d98061f4..b062028877 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -144,7 +144,6 @@
         <include>${pom.groupId}:activeio-core</include>
         <include>commons-beanutils:commons-beanutils</include>
         <include>commons-collections:commons-collections</include>
-        <include>commons-httpclient:commons-httpclient</include>
         <include>commons-dbcp:commons-dbcp</include>
         <include>commons-pool:commons-pool</include>
         <include>commons-codec:commons-codec</include>
@@ -153,6 +152,8 @@
         <include>org.slf4j:slf4j-log4j12</include>
         <include>log4j:log4j</include>
         <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+        <include>org.apache.httpcomponents:httpclient</include>
+        <include>org.apache.httpcomponents:httpcore</include>
         <include>org.apache.xbean:xbean-spring</include>
         <include>org.springframework:spring-aop</include>
         <include>org.springframework:spring-asm</include>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 70b5e2f7fb..da42327a0c 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -72,6 +72,8 @@
         <include>bin/activemq-admin</include>
         <include>bin/macosx/activemq</include>
         <include>bin/linux-*/activemq</include>
+        <include>example/**/*.sh</include>
+        <include>example/**/*.rb</include>
       </includes>
       <directoryMode>0755</directoryMode>
       <fileMode>0755</fileMode>
diff --git a/assembly/src/release/example/perfharness/perfharness-activemq.sh b/assembly/src/release/example/perfharness/perfharness-activemq.sh
index 3d9a001219..afade8d271 100755
--- a/assembly/src/release/example/perfharness/perfharness-activemq.sh
+++ b/assembly/src/release/example/perfharness/perfharness-activemq.sh
@@ -22,7 +22,7 @@
 # Sample Usage: 
 #   ./perfharness-activemq.sh -d dynamicQueues/FOO -tc jms.r11.PutGet -nt 6
 #
-# It assumes that the apache-activemq-5.0-SNAPSHOT.jar and 
+# It assumes that the apache-activemq JAR and 
 # perfharness.jar files are in the current directory.  If they are not,
 # set the ACTIVEMQ_HOME and PERFHARNESS_HOME env variable to the correct location.
 #
@@ -46,4 +46,4 @@ if [ -z "$BROKER_URL" ] ; then
    BROKER_URL='vm://(broker://()/localhost?useJmx=false)/localhost'
 fi
 
-java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-5.0-SNAPSHOT.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
+java ${JAVA_OPTIONS} -cp ${ACTIVEMQ_HOME}/apache-activemq-${project.version}.jar:${PERFHARNESS_HOME}/perfharness.jar JMSPerfHarness -pc JNDI -ii org.apache.activemq.jndi.ActiveMQInitialContextFactory -iu $BROKER_URL -cf ConnectionFactory -d dynamic$DESTINATION $@
diff --git a/pom.xml b/pom.xml
index bdd814db61..7412aa3d61 100755
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@
     <howl-version>0.1.8</howl-version>
     <hsqldb-version>1.8.0.10</hsqldb-version>
     <httpclient-version>4.2.1</httpclient-version>
+    <httpcore-version>4.2.1</httpcore-version>
     <jackson-version>1.9.2</jackson-version>
     <jasypt-version>1.9.0</jasypt-version>
     <jdom-version>1.0</jdom-version>
@@ -828,6 +829,12 @@
         <version>${httpclient-version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${httpcore-version}</version>
+      </dependency>
+
       <dependency>
         <groupId>aopalliance</groupId>
         <artifactId>aopalliance</artifactId>