--- a/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfPKCS7.java
+++ b/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfPKCS7.java
@@ -78,40 +78,40 @@ import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
-import org.spongycastle.asn1.ASN1Encodable;
-import org.spongycastle.asn1.ASN1EncodableVector;
-import org.spongycastle.asn1.ASN1Enumerated;
-import org.spongycastle.asn1.ASN1InputStream;
-import org.spongycastle.asn1.ASN1Integer;
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.ASN1OctetString;
-import org.spongycastle.asn1.ASN1OutputStream;
-import org.spongycastle.asn1.ASN1Primitive;
-import org.spongycastle.asn1.ASN1Sequence;
-import org.spongycastle.asn1.ASN1Set;
-import org.spongycastle.asn1.ASN1String;
-import org.spongycastle.asn1.ASN1TaggedObject;
-import org.spongycastle.asn1.BERTaggedObject;
-import org.spongycastle.asn1.DERNull;
-import org.spongycastle.asn1.DEROctetString;
-import org.spongycastle.asn1.DERSequence;
-import org.spongycastle.asn1.DERSet;
-import org.spongycastle.asn1.DERTaggedObject;
-import org.spongycastle.asn1.DERUTCTime;
-import org.spongycastle.asn1.cms.Attribute;
-import org.spongycastle.asn1.cms.AttributeTable;
-import org.spongycastle.asn1.cms.ContentInfo;
-import org.spongycastle.asn1.ocsp.BasicOCSPResponse;
-import org.spongycastle.asn1.ocsp.OCSPObjectIdentifiers;
-import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.spongycastle.cert.X509CertificateHolder;
-import org.spongycastle.cert.ocsp.BasicOCSPResp;
-import org.spongycastle.cert.ocsp.CertificateID;
-import org.spongycastle.cert.ocsp.SingleResp;
-import org.spongycastle.jce.provider.X509CRLParser;
-import org.spongycastle.jce.provider.X509CertParser;
-import org.spongycastle.operator.bc.BcDigestCalculatorProvider;
-import org.spongycastle.tsp.TimeStampToken;
+import org.bouncycastle.asn1.ASN1Encodable;
+import org.bouncycastle.asn1.ASN1EncodableVector;
+import org.bouncycastle.asn1.ASN1Enumerated;
+import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1Integer;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1OctetString;
+import org.bouncycastle.asn1.ASN1OutputStream;
+import org.bouncycastle.asn1.ASN1Primitive;
+import org.bouncycastle.asn1.ASN1Sequence;
+import org.bouncycastle.asn1.ASN1Set;
+import org.bouncycastle.asn1.ASN1String;
+import org.bouncycastle.asn1.ASN1TaggedObject;
+import org.bouncycastle.asn1.BERTaggedObject;
+import org.bouncycastle.asn1.DERNull;
+import org.bouncycastle.asn1.DEROctetString;
+import org.bouncycastle.asn1.DERSequence;
+import org.bouncycastle.asn1.DERSet;
+import org.bouncycastle.asn1.DERTaggedObject;
+import org.bouncycastle.asn1.DERUTCTime;
+import org.bouncycastle.asn1.cms.Attribute;
+import org.bouncycastle.asn1.cms.AttributeTable;
+import org.bouncycastle.asn1.cms.ContentInfo;
+import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
+import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.bouncycastle.cert.X509CertificateHolder;
+import org.bouncycastle.cert.ocsp.BasicOCSPResp;
+import org.bouncycastle.cert.ocsp.CertificateID;
+import org.bouncycastle.cert.ocsp.SingleResp;
+import org.bouncycastle.jce.provider.X509CRLParser;
+import org.bouncycastle.jce.provider.X509CertParser;
+import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
+import org.bouncycastle.tsp.TimeStampToken;
 
 import com.aowagie.text.ExceptionConverter;
 
@@ -119,7 +119,7 @@ import com.aowagie.text.ExceptionConverter;
  * This class does all the processing related to signing and verifying a PKCS#7
  * signature.
  * <p>
- * It's based in code found at org.spongycastle.
+ * It's based in code found at org.bouncycastle.
  */
 public final class PdfPKCS7 {
 
@@ -890,7 +890,7 @@
 			}
             final ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
 
-            final ASN1OutputStream dout = new ASN1OutputStream(bOut);
+            final ASN1OutputStream dout = ASN1OutputStream.create(bOut);
             dout.writeObject(new DEROctetString(this.digest));
             dout.close();
 
@@ -1077,7 +1077,7 @@
 
             final ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
 
-            final ASN1OutputStream dout = new ASN1OutputStream(bOut);
+            final ASN1OutputStream dout = ASN1OutputStream.create(bOut);
             dout.writeObject(new DERSequence(whole));
             dout.close();
 
--- a/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfPublicKeySecurityHandler.java
+++ b/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfPublicKeySecurityHandler.java
@@ -105,23 +105,24 @@ import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
 
-import org.spongycastle.asn1.ASN1InputStream;
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.ASN1Primitive;
-import org.spongycastle.asn1.ASN1Set;
-import org.spongycastle.asn1.DEROctetString;
-import org.spongycastle.asn1.DEROutputStream;
-import org.spongycastle.asn1.DERSet;
-import org.spongycastle.asn1.cms.ContentInfo;
-import org.spongycastle.asn1.cms.EncryptedContentInfo;
-import org.spongycastle.asn1.cms.EnvelopedData;
-import org.spongycastle.asn1.cms.IssuerAndSerialNumber;
-import org.spongycastle.asn1.cms.KeyTransRecipientInfo;
-import org.spongycastle.asn1.cms.RecipientIdentifier;
-import org.spongycastle.asn1.cms.RecipientInfo;
-import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.spongycastle.asn1.x509.AlgorithmIdentifier;
-import org.spongycastle.asn1.x509.TBSCertificateStructure;
+import org.bouncycastle.asn1.ASN1Encoding;
+import org.bouncycastle.asn1.ASN1InputStream;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.asn1.ASN1OutputStream;
+import org.bouncycastle.asn1.ASN1Primitive;
+import org.bouncycastle.asn1.ASN1Set;
+import org.bouncycastle.asn1.DEROctetString;
+import org.bouncycastle.asn1.DERSet;
+import org.bouncycastle.asn1.cms.ContentInfo;
+import org.bouncycastle.asn1.cms.EncryptedContentInfo;
+import org.bouncycastle.asn1.cms.EnvelopedData;
+import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
+import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
+import org.bouncycastle.asn1.cms.RecipientIdentifier;
+import org.bouncycastle.asn1.cms.RecipientInfo;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
+import org.bouncycastle.asn1.x509.TBSCertificateStructure;
 
 /**
  * @author Aiken Sam (aikensam@ieee.org)
@@ -208,7 +209,7 @@ class PdfPublicKeySecurityHandler {
 
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
-        final DEROutputStream k = new DEROutputStream(baos);
+        final ASN1OutputStream k = ASN1OutputStream.create(baos, ASN1Encoding.DER);
 
         k.writeObject(obj);
 
--- a/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfReader.java
+++ b/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/PdfReader.java
@@ -71,9 +71,9 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.zip.InflaterInputStream;
 
-import org.spongycastle.cms.CMSEnvelopedData;
-import org.spongycastle.cms.RecipientInformation;
-import org.spongycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
+import org.bouncycastle.cms.CMSEnvelopedData;
+import org.bouncycastle.cms.RecipientInformation;
+import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
 
 import com.aowagie.text.ExceptionConverter;
 import com.aowagie.text.PageSize;
--- a/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/crypto/AESCipher.java
+++ b/afirma-lib-itext/src/main/java/com/aowagie/text/pdf/crypto/AESCipher.java
@@ -48,12 +48,12 @@
  */
 package com.aowagie.text.pdf.crypto;
 
-import org.spongycastle.crypto.BlockCipher;
-import org.spongycastle.crypto.engines.AESFastEngine;
-import org.spongycastle.crypto.modes.CBCBlockCipher;
-import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.spongycastle.crypto.params.KeyParameter;
-import org.spongycastle.crypto.params.ParametersWithIV;
+import org.bouncycastle.crypto.BlockCipher;
+import org.bouncycastle.crypto.engines.AESFastEngine;
+import org.bouncycastle.crypto.modes.CBCBlockCipher;
+import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.bouncycastle.crypto.params.ParametersWithIV;
 
 /**
  * Creates an AES Cipher with CBC and padding PKCS5/7.