diff --git a/pom.xml b/pom.xml
index 92edd20..6415019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
             <version>1.7.0</version>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.4</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
diff --git a/src/main/java/org/cyclopsgroup/jcli/ValidationResult.java b/src/main/java/org/cyclopsgroup/jcli/ValidationResult.java
index 4cacc43..576bbd4 100644
--- a/src/main/java/org/cyclopsgroup/jcli/ValidationResult.java
+++ b/src/main/java/org/cyclopsgroup/jcli/ValidationResult.java
@@ -4,7 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Argument validation result coming from {@link ArgumentProcessor#validate(String[])}
diff --git a/src/main/java/org/cyclopsgroup/jcli/example/UserControl.java b/src/main/java/org/cyclopsgroup/jcli/example/UserControl.java
index bcfaa77..6308c5a 100644
--- a/src/main/java/org/cyclopsgroup/jcli/example/UserControl.java
+++ b/src/main/java/org/cyclopsgroup/jcli/example/UserControl.java
@@ -3,7 +3,7 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.cyclopsgroup.caff.conversion.DateField;
 import org.cyclopsgroup.jcli.ArgumentProcessor;
 import org.cyclopsgroup.jcli.annotation.Argument;
diff --git a/src/main/java/org/cyclopsgroup/jcli/impl/AnnotationOption.java b/src/main/java/org/cyclopsgroup/jcli/impl/AnnotationOption.java
index b2564cc..e132dd1 100644
--- a/src/main/java/org/cyclopsgroup/jcli/impl/AnnotationOption.java
+++ b/src/main/java/org/cyclopsgroup/jcli/impl/AnnotationOption.java
@@ -1,7 +1,7 @@
 package org.cyclopsgroup.jcli.impl;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.cyclopsgroup.jcli.annotation.Option;
 
 class AnnotationOption
diff --git a/src/main/java/org/cyclopsgroup/jcli/impl/DefaultHelpPrinter.java b/src/main/java/org/cyclopsgroup/jcli/impl/DefaultHelpPrinter.java
index a4d5b27..7e69f4a 100644
--- a/src/main/java/org/cyclopsgroup/jcli/impl/DefaultHelpPrinter.java
+++ b/src/main/java/org/cyclopsgroup/jcli/impl/DefaultHelpPrinter.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.cyclopsgroup.caff.format.Format;
 import org.cyclopsgroup.caff.format.Formats;
 import org.cyclopsgroup.jcli.spi.Option;
diff --git a/src/main/java/org/cyclopsgroup/jcli/impl/OptionHelp.java b/src/main/java/org/cyclopsgroup/jcli/impl/OptionHelp.java
index 0e72d8c..4715b5e 100644
--- a/src/main/java/org/cyclopsgroup/jcli/impl/OptionHelp.java
+++ b/src/main/java/org/cyclopsgroup/jcli/impl/OptionHelp.java
@@ -1,6 +1,6 @@
 package org.cyclopsgroup.jcli.impl;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.cyclopsgroup.caff.format.FixLengthField;
 import org.cyclopsgroup.caff.format.FixLengthType;
 import org.cyclopsgroup.jcli.spi.Option;
diff --git a/src/main/java/org/cyclopsgroup/jcli/impl/Reference.java b/src/main/java/org/cyclopsgroup/jcli/impl/Reference.java
index 7652a87..2ff8435 100644
--- a/src/main/java/org/cyclopsgroup/jcli/impl/Reference.java
+++ b/src/main/java/org/cyclopsgroup/jcli/impl/Reference.java
@@ -1,6 +1,6 @@
 package org.cyclopsgroup.jcli.impl;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.cyclopsgroup.caff.conversion.Converter;
 import org.cyclopsgroup.caff.ref.ValueReference;
 
diff --git a/src/main/java/org/cyclopsgroup/jcli/jline/CliCompletor.java b/src/main/java/org/cyclopsgroup/jcli/jline/CliCompletor.java
index 7191978..e56673c 100644
--- a/src/main/java/org/cyclopsgroup/jcli/jline/CliCompletor.java
+++ b/src/main/java/org/cyclopsgroup/jcli/jline/CliCompletor.java
@@ -9,8 +9,8 @@
 
 import jline.console.completer.Completer;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
 import org.cyclopsgroup.caff.token.TokenEvent;
 import org.cyclopsgroup.caff.token.TokenEventHandler;
 import org.cyclopsgroup.caff.token.ValueTokenizer;
diff --git a/src/main/java/org/cyclopsgroup/jcli/spi/CommandLine.java b/src/main/java/org/cyclopsgroup/jcli/spi/CommandLine.java
index 5dfc6ff..7293dde 100644
--- a/src/main/java/org/cyclopsgroup/jcli/spi/CommandLine.java
+++ b/src/main/java/org/cyclopsgroup/jcli/spi/CommandLine.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * Data that comes from command arguments
diff --git a/src/test/java/org/cyclopsgroup/jcli/Simple.java b/src/test/java/org/cyclopsgroup/jcli/Simple.java
index c82ff89..8468cf7 100644
--- a/src/test/java/org/cyclopsgroup/jcli/Simple.java
+++ b/src/test/java/org/cyclopsgroup/jcli/Simple.java
@@ -4,7 +4,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 import org.cyclopsgroup.jcli.annotation.Argument;
 import org.cyclopsgroup.jcli.annotation.Cli;
 import org.cyclopsgroup.jcli.annotation.MultiValue;