diff --git a/CHANGES.txt b/CHANGES.txt
index bd2ffa3..94cf147 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,8 @@
  
 IMPROVEMENTS
 
+PIG-5236: json simple jar not included automatically with piggybank AvroStorage (satishsaley via rohini)
+
 PIG-3103: make mockito a test dependency (instead of compile) (nkollar via szita)
 
 PIG-3021: Split results missing records when there is null values in the column comparison (jeffjee617, cheolsoo via daijy)
diff --git a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java b/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
index f2339b2..0d3f8d9 100644
--- a/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
+++ b/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/storage/avro/AvroStorage.java
@@ -55,7 +55,9 @@
 import org.apache.pig.ResourceStatistics;
 import org.apache.pig.StoreFunc;
 import org.apache.pig.StoreFuncInterface;
+import org.apache.pig.StoreResources;
 import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.PigSplit;
+import org.apache.pig.builtin.FuncUtils;
 import org.apache.pig.data.Tuple;
 import org.apache.pig.impl.util.ObjectSerializer;
 import org.apache.pig.impl.util.UDFContext;
@@ -67,7 +69,7 @@
  * AvroStorage is used to load/store Avro data <br/>
  * Document can be found <a href='https://cwiki.apache.org/PIG/avrostorage.html'>here</a>
  */
-public class AvroStorage extends FileInputLoadFunc implements StoreFuncInterface, LoadMetadata {
+public class AvroStorage extends FileInputLoadFunc implements StoreFuncInterface, LoadMetadata, StoreResources {
 
     private static final Log LOG = LogFactory.getLog(AvroStorage.class);
     /* storeFunc parameters */
@@ -812,4 +814,11 @@
             e.printStackTrace();
         }
     }
+
+    @Override
+    public List<String> getShipFiles() {
+        ArrayList<Class> classList = new ArrayList<Class>();
+        classList.add(JSONParser.class);
+        return FuncUtils.getShipFiles(classList);
+    }
 }