diff --git a/Bug748738_Tolerate_bad_MIME_headers.patch b/Bug748738_Tolerate_bad_MIME_headers.patch
new file mode 100644
index 0000000..261b2ec
--- /dev/null
+++ b/Bug748738_Tolerate_bad_MIME_headers.patch
@@ -0,0 +1,15 @@
+Index: openssl-1.0.0g/crypto/asn1/asn_mime.c
+===================================================================
+--- openssl-1.0.0g.orig/crypto/asn1/asn_mime.c
++++ openssl-1.0.0g/crypto/asn1/asn_mime.c
+@@ -858,6 +858,10 @@ static int mime_hdr_addparam(MIME_HEADER
+ static int mime_hdr_cmp(const MIME_HEADER * const *a,
+ 			const MIME_HEADER * const *b)
+ {
++	if ((*a)->name == NULL || (*b)->name == NULL)
++		return (*a)->name - (*b)->name < 0 ? -1 :
++			(*a)->name - (*b)->name > 0 ? 1 : 0;
++
+ 	return(strcmp((*a)->name, (*b)->name));
+ }
+ 
diff --git a/openssl.changes b/openssl.changes
index 4ebbcdb..1ecf19c 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 24 02:33:22 UTC 2012 - gjhe@suse.com
+
+- fix bug[bnc#748738] - Tolerate bad MIME headers in openssl's 
+  asn1 parser.
+
 -------------------------------------------------------------------
 Thu Feb  2 06:55:12 UTC 2012 - gjhe@suse.com
 
diff --git a/openssl.spec b/openssl.spec
index cab5ef0..31162b9 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -49,6 +49,7 @@ Patch2:         bug610223.patch
 Patch7:         openssl-1.0.0b-aesni.patch
 #Patch8:         CVE-2011-0014.patch
 Patch10:        openssl-call-engine-reg-comp.patch
+Patch11:        Bug748738_Tolerate_bad_MIME_headers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -186,6 +187,7 @@ Authors:
 %patch7
 #%patch8 -p1
 %patch10
+%patch11 -p1
 cp -p %{S:10} .
 echo "adding/overwriting some entries in the 'table' hash in Configure"
 # $dso_scheme:$shared_target:$shared_cflag:$shared_ldflag:$shared_extension:$ranlib:$arflags