diff --git a/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.jar b/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.jar
new file mode 100644
index 0000000000..4435c65c72
Binary files /dev/null and b/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.jar differ
diff --git a/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.pom b/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.pom
new file mode 100755
index 0000000000..c8fe94e72b
--- /dev/null
+++ b/embedded-repo/org/codehaus/aspectwerkz/aspectwerkz/2.2.3/aspectwerkz-2.2.3.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.codehaus.aspectwerkz</groupId>
+   <artifactId>aspectwerkz</artifactId>
+   <version>2.2.3</version>
+   <packaging>jar</packaging>
+</project>
\ No newline at end of file
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 5bbd3e92ff..d67c12c1ae 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -129,7 +129,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   lazy val LOGBACK_VERSION       = "0.9.24"
   lazy val SLF4J_VERSION         = "1.6.0"
   lazy val SPRING_VERSION        = "3.0.4.RELEASE"
-  lazy val ASPECTWERKZ_VERSION   = "2.2.2"
   lazy val JETTY_VERSION         = "7.1.6.v20100715"
 
   // -------------------------------------------------------------------------------------------------------------------
@@ -139,10 +138,10 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
   object Dependencies {
 
     // Compile
-    lazy val commonsHttpClient = "commons-httpclient" % "commons-httpclient" % "3.1" % "compile" //ApacheV2
-
     lazy val aopalliance = "aopalliance" % "aopalliance" % "1.0" % "compile" //Public domain
 
+    lazy val aspectwerkz = "org.codehaus.aspectwerkz" % "aspectwerkz" % "2.2.3" % "compile" //LGPL 2.1
+
     lazy val atmo          = "org.atmosphere" % "atmosphere-annotations"     % ATMO_VERSION % "compile" //CDDL v1
     lazy val atmo_jbossweb = "org.atmosphere" % "atmosphere-compat-jbossweb" % ATMO_VERSION % "compile" //CDDL v1
     lazy val atmo_jersey   = "org.atmosphere" % "atmosphere-jersey"          % ATMO_VERSION % "compile" //CDDL v1
@@ -158,6 +157,8 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
 
     lazy val cassandra = "org.apache.cassandra" % "cassandra" % CASSANDRA_VERSION % "compile" //ApacheV2
 
+    lazy val commonsHttpClient = "commons-httpclient" % "commons-httpclient" % "3.1" % "compile" //ApacheV2
+
     lazy val commons_codec = "commons-codec" % "commons-codec" % "1.4" % "compile" //ApacheV2
 
     lazy val commons_io = "commons-io" % "commons-io" % "1.4" % "compile" //ApacheV2
@@ -236,9 +237,6 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
     lazy val voldemort_contrib = "voldemort" % "voldemort-contrib" % "0.81" % "compile" //ApacheV2
     lazy val voldemort_needs_log4j = "org.slf4j" % "log4j-over-slf4j" % SLF4J_VERSION % "compile" //MIT
 
-    lazy val werkz      = "org.codehaus.aspectwerkz" % "aspectwerkz-nodeps-jdk5" % ASPECTWERKZ_VERSION % "compile" //LGPL 2.1
-    lazy val werkz_core = "org.codehaus.aspectwerkz" % "aspectwerkz-jdk5"        % ASPECTWERKZ_VERSION % "compile" //LGPL 2.1
-
     lazy val zookeeper  = "org.apache.hadoop.zookeeper" % "zookeeper" % "3.2.2" % "compile" //ApacheV2
 
     lazy val hadoop_core = "org.apache.hadoop" % "hadoop-core" % "0.20.2" % "compile" //ApacheV2
@@ -445,8 +443,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
 
   class AkkaTypedActorProject(info: ProjectInfo) extends AkkaDefaultProject(info, distPath) {
     val aopalliance   = Dependencies.aopalliance
-    val werkz         = Dependencies.werkz
-    val werkz_core    = Dependencies.werkz_core
+    val aspectwerkz   = Dependencies.aspectwerkz
     val guicey        = Dependencies.guicey
 
     // testing