diff --git a/pom.xml b/pom.xml
index 1639b8264..4ccbf1f01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysema.codegen</groupId>
   <artifactId>codegen</artifactId>
-  <version>0.4.3</version>
+  <version>0.4.4</version>
   <name>Codegen</name>
   <description>Code generation and compilation for Java</description>
   <parent>
@@ -18,18 +18,18 @@
   
   <properties>
     <commons.collections.version>4.01</commons.collections.version>
-    <commons.lang.version>2.4</commons.lang.version>
+    <commons.lang.version>3.0.1</commons.lang.version>
   </properties>
   
   <dependencies>
-    <dependency>
+  <dependency>
       <groupId>net.sourceforge.collections</groupId>
       <artifactId>collections-generic</artifactId>
       <version>${commons.collections.version}</version>
     </dependency> 
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
       <version>${commons.lang.version}</version>
     </dependency>
     
@@ -123,4 +123,4 @@
   </pluginRepositories>
   
   
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/com/mysema/codegen/AbstractCodeWriter.java b/src/main/java/com/mysema/codegen/AbstractCodeWriter.java
index 9862f5ddc..bacdc3e7e 100644
--- a/src/main/java/com/mysema/codegen/AbstractCodeWriter.java
+++ b/src/main/java/com/mysema/codegen/AbstractCodeWriter.java
@@ -9,7 +9,7 @@ import static com.mysema.codegen.Symbols.NEWLINE;
 
 import java.io.IOException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author tiwe
diff --git a/src/main/java/com/mysema/codegen/JavaWriter.java b/src/main/java/com/mysema/codegen/JavaWriter.java
index dfcafdb60..84d29323e 100644
--- a/src/main/java/com/mysema/codegen/JavaWriter.java
+++ b/src/main/java/com/mysema/codegen/JavaWriter.java
@@ -23,7 +23,7 @@ import java.util.Set;
 import java.util.Stack;
 
 import org.apache.commons.collections15.Transformer;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import com.mysema.codegen.model.Parameter;
 import com.mysema.codegen.model.Type;
diff --git a/src/main/java/com/mysema/codegen/ScalaWriter.java b/src/main/java/com/mysema/codegen/ScalaWriter.java
index e62ea35aa..fbae3e36c 100644
--- a/src/main/java/com/mysema/codegen/ScalaWriter.java
+++ b/src/main/java/com/mysema/codegen/ScalaWriter.java
@@ -16,7 +16,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.apache.commons.collections15.Transformer;
-import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
 
 import com.mysema.codegen.model.Parameter;
 import com.mysema.codegen.model.Type;
diff --git a/src/main/java/com/mysema/codegen/model/TypeExtends.java b/src/main/java/com/mysema/codegen/model/TypeExtends.java
index 073635e30..0ea13cd81 100644
--- a/src/main/java/com/mysema/codegen/model/TypeExtends.java
+++ b/src/main/java/com/mysema/codegen/model/TypeExtends.java
@@ -12,7 +12,7 @@ import javax.annotation.Nullable;
 
 import net.jcip.annotations.Immutable;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author tiwe
diff --git a/template.mf b/template.mf
index e2845e0ff..93ecf636a 100644
--- a/template.mf
+++ b/template.mf
@@ -5,7 +5,7 @@ Bundle-ManifestVersion: 2
 Import-Template:  
   javax.annotation.*;version="0",
   org.apache.commons.collections15.*;version="${commons.collections.version}",
-  org.apache.commons.lang.*;version="${commons.lang.version}",
+  org.apache.commons.lang3.*;version="${commons.lang.version}",
   javax.tools.*;version="1"
 Excluded-Imports:
   edu.umd.cs.findbugs.annotations.*,