diff --git a/tls.go b/tls.go
index 1b056121..fbaf8d6d 100644
--- a/tls.go
+++ b/tls.go
@@ -12,8 +12,10 @@ import (
 	"time"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/zmap/zcrypto/encoding/asn1"
 	"github.com/zmap/zcrypto/tls"
 	"github.com/zmap/zcrypto/x509"
+	"github.com/zmap/zcrypto/x509/pkix"
 )
 
 // Shared code for TLS scans.
@@ -65,7 +67,7 @@ type TLSFlags struct {
 	// TODO: format?
 	ClientRandom string `long:"client-random" description:"Set an explicit Client Random (base64 encoded)"`
 	// TODO: format?
-	ClientHello string `long:"client-hello" description:"Set an explicit ClientHello (base64 encoded)"`
+	ClientHello       string `long:"client-hello" description:"Set an explicit ClientHello (base64 encoded)"`
 }
 
 func getCSV(arg string) []string {
@@ -149,6 +151,10 @@ func (t *TLSFlags) GetTLSConfigForTarget(target *ScanTarget) (*tls.Config, error
 			log.Fatalf("Could not read certificates from PEM file. Invalid PEM?")
 		}
 	}
+
+  asn1.AllowPermissiveParsing = true
+  pkix.LegacyNameString = true
+
 	if t.NextProtos != "" {
 		// TODO: Different format?
 		ret.NextProtos = getCSV(t.NextProtos)