diff --git a/zxingorg/pom.xml b/zxingorg/pom.xml
index 5818119da..1c491c1a9 100644
--- a/zxingorg/pom.xml
+++ b/zxingorg/pom.xml
@@ -37,11 +37,6 @@
       <artifactId>javaee-web-api</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.1</version>
-    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/zxingorg/src/web/w/decoderesult.jspx b/zxingorg/src/web/w/decoderesult.jspx
index 1f0316ea5..98333dee2 100644
--- a/zxingorg/src/web/w/decoderesult.jspx
+++ b/zxingorg/src/web/w/decoderesult.jspx
@@ -16,12 +16,11 @@
  -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.1">
 <jsp:directive.page import="
-  java.util.List,
   com.google.zxing.Result,
   com.google.zxing.client.result.ResultParser,
   com.google.zxing.client.result.ParsedResult,
   com.google.zxing.web.OutputUtils,
-  org.apache.commons.lang3.StringEscapeUtils"/>
+  com.google.common.xml.XmlEscapers"/>
 <jsp:directive.page contentType="text/html" session="false"/>
 <jsp:scriptlet>
   response.setHeader("Cache-Control", "no-cache");
@@ -42,14 +41,14 @@
     <div id="main">
     <div id="header"><h1><img src="zxing-icon.png" height="32" width="32" alt=""/> Decode Succeeded</h1></div>
     <jsp:scriptlet>
-      for (Result result : (List&lt;Result&gt;) request.getAttribute("results")) {
+      for (Result result : (Iterable&lt;Result&gt;) request.getAttribute("results")) {
         ParsedResult parsedResult = ResultParser.parseResult(result);
 
         String text = result.getText();
         if (text == null) {
           text = "(Not applicable)";
         } else {
-          text = StringEscapeUtils.escapeXml(text);
+          text = XmlEscapers.xmlContentEscaper().escape(text);
         }
 
         byte[] rawBytes = result.getRawBytes();
@@ -64,7 +63,7 @@
         if (displayResult == null) {
           displayResult = "(Not applicable)";
         } else {
-          displayResult = StringEscapeUtils.escapeXml(displayResult);
+          displayResult = XmlEscapers.xmlContentEscaper().escape(displayResult);
         }
     </jsp:scriptlet>
     <table style="width:100%">