diff --git a/fetch.xml b/fetch.xml
index 0e4ced440..371adaf09 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -305,7 +305,6 @@ Set -Ddest=LOCATION on the command line
           description="load BeanShell support"
           depends="bsf">
     <f2 project="org.beanshell" archive="bsh"/>
-    <f2 project="org.beanshell" archive="bsh-core"/>
   </target>
 
   <target name="jython"
diff --git a/lib/libraries.properties b/lib/libraries.properties
index 26eebb73f..ef9ef090f 100644
--- a/lib/libraries.properties
+++ b/lib/libraries.properties
@@ -35,8 +35,7 @@ ant-antunit.version=1.4
 antlr.version=2.7.7
 bcel.version=6.2
 bsf.version=2.4.0
-bsh.version=2.0b4
-bsh-core.version=${bsh.version}
+bsh.version=2.0b5
 commons-net.version=3.6
 commons-logging.version=1.1
 commons-logging-api.version=${commons-logging.version}
@@ -48,7 +47,7 @@ jakarta-regexp.version=1.4
 # Later versions of Tomcat provide a jspc task
 jasper-compiler.version=4.1.36
 jasper-runtime.version=${jasper-compiler.version}
-javax.mail.version=1.6.1
+javax.mail.version=1.6.2
 jdepend.version=2.9.1
 jruby.version=1.6.8
 junit.version=4.12