diff --git a/opensc-gcc11.patch b/opensc-gcc11.patch
index 0f41d60..660bc0f 100644
--- a/opensc-gcc11.patch
+++ b/opensc-gcc11.patch
@@ -15,3 +15,142 @@ index 41e620a..57f8a79 100644
  	/* loop over the args and parse them, making sure the result fits into buf[] */
  	for (i = 0, len = 0; i < (unsigned) argc && len < sizeof(buf); i++)   {
  		size_t len0 = sizeof(buf) - len;
+commit 1680b3a1fb15319e41dbe3214ef8c4a4c215d529
+Author: Jakub Jelen <jjelen@redhat.com>
+Date:   Tue Feb 23 19:57:02 2021 +0100
+
+    Fix build on gcc11
+    
+    This made most of the applications crashing in Fedora 34 when
+    smart card was plugged in.
+    
+    The suggested patch makes the code path more obvious for gcc to
+    handle.
+    
+    https://bugzilla.redhat.com/show_bug.cgi?id=1930652
+
+diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c
+index 18803b83..c65ec3ed 100644
+--- a/src/pkcs11/framework-pkcs15.c
++++ b/src/pkcs11/framework-pkcs15.c
+@@ -670,6 +670,7 @@ __pkcs15_create_cert_object(struct pkcs15_fw_data *fw_data, struct sc_pkcs15_obj
+ {
+ 	struct sc_pkcs15_cert_info *p15_info = NULL;
+ 	struct sc_pkcs15_cert *p15_cert = NULL;
++	struct pkcs15_any_object *any_object = NULL;
+ 	struct pkcs15_cert_object *object = NULL;
+ 	struct pkcs15_pubkey_object *obj2 = NULL;
+ 	int rv;
+@@ -686,8 +687,9 @@ __pkcs15_create_cert_object(struct pkcs15_fw_data *fw_data, struct sc_pkcs15_obj
+ 	}
+ 
+ 	/* Certificate object */
+-	rv = __pkcs15_create_object(fw_data, (struct pkcs15_any_object **) &object,
++	rv = __pkcs15_create_object(fw_data, &any_object,
+ 			cert, &pkcs15_cert_ops, sizeof(struct pkcs15_cert_object));
++	object = (struct pkcs15_cert_object *) any_object;
+ 	if (rv < 0) {
+ 		if (p15_cert != NULL)
+ 			sc_pkcs15_free_certificate(p15_cert);
+@@ -720,7 +722,7 @@ __pkcs15_create_cert_object(struct pkcs15_fw_data *fw_data, struct sc_pkcs15_obj
+ 	pkcs15_cert_extract_label(object);
+ 
+ 	if (cert_object != NULL)
+-		*cert_object = (struct pkcs15_any_object *) object;
++		*cert_object = any_object;
+ 
+ 	return 0;
+ }
+@@ -730,6 +732,7 @@ static int
+ __pkcs15_create_pubkey_object(struct pkcs15_fw_data *fw_data,
+ 	struct sc_pkcs15_object *pubkey, struct pkcs15_any_object **pubkey_object)
+ {
++	struct pkcs15_any_object *any_object = NULL;
+ 	struct pkcs15_pubkey_object *object = NULL;
+ 	struct sc_pkcs15_pubkey *p15_key = NULL;
+ 	int rv;
+@@ -758,8 +761,9 @@ __pkcs15_create_pubkey_object(struct pkcs15_fw_data *fw_data,
+ 	}
+ 
+ 	/* Public key object */
+-	rv = __pkcs15_create_object(fw_data, (struct pkcs15_any_object **) &object,
++	rv = __pkcs15_create_object(fw_data, &any_object,
+ 			pubkey, &pkcs15_pubkey_ops, sizeof(struct pkcs15_pubkey_object));
++	object = (struct pkcs15_pubkey_object *) any_object;
+ 	if (rv >= 0) {
+ 		object->pub_info = (struct sc_pkcs15_pubkey_info *) pubkey->data;
+ 		object->pub_data = p15_key;
+@@ -773,7 +777,7 @@ __pkcs15_create_pubkey_object(struct pkcs15_fw_data *fw_data,
+ 			object->pub_data->alg_id->params = &((object->pub_data->u).gostr3410.params);
+ 	}
+ 	if (pubkey_object != NULL)
+-		*pubkey_object = (struct pkcs15_any_object *) object;
++		*pubkey_object = any_object;
+ 
+ 	return rv;
+ }
+@@ -783,16 +787,18 @@ static int
+ __pkcs15_create_prkey_object(struct pkcs15_fw_data *fw_data,
+ 	struct sc_pkcs15_object *prkey, struct pkcs15_any_object **prkey_object)
+ {
++	struct pkcs15_any_object *any_object = NULL;
+ 	struct pkcs15_prkey_object *object = NULL;
+ 	int rv;
+ 
+-	rv = __pkcs15_create_object(fw_data, (struct pkcs15_any_object **) &object,
++	rv = __pkcs15_create_object(fw_data, &any_object,
+ 			prkey, &pkcs15_prkey_ops, sizeof(struct pkcs15_prkey_object));
++	object = (struct pkcs15_prkey_object *) any_object;
+ 	if (rv >= 0)
+ 		object->prv_info = (struct sc_pkcs15_prkey_info *) prkey->data;
+ 
+ 	if (prkey_object != NULL)
+-		*prkey_object = (struct pkcs15_any_object *) object;
++		*prkey_object = any_object;
+ 
+ 	return rv;
+ }
+@@ -802,18 +808,20 @@ static int
+ __pkcs15_create_data_object(struct pkcs15_fw_data *fw_data,
+ 		struct sc_pkcs15_object *object, struct pkcs15_any_object **data_object)
+ {
++	struct pkcs15_any_object *any_object = NULL;
+ 	struct pkcs15_data_object *dobj = NULL;
+ 	int rv;
+ 
+-	rv = __pkcs15_create_object(fw_data, (struct pkcs15_any_object **) &dobj,
++	rv = __pkcs15_create_object(fw_data, &any_object,
+ 			object, &pkcs15_dobj_ops, sizeof(struct pkcs15_data_object));
++        dobj = (struct pkcs15_data_object *) any_object;
+ 	if (rv >= 0)   {
+ 		dobj->info = (struct sc_pkcs15_data_info *) object->data;
+ 		dobj->value = NULL;
+ 	}
+ 
+ 	if (data_object != NULL)
+-		*data_object = (struct pkcs15_any_object *) dobj;
++		*data_object = any_object;
+ 
+ 	return rv;
+ }
+@@ -853,16 +861,18 @@ static int
+ __pkcs15_create_secret_key_object(struct pkcs15_fw_data *fw_data,
+ 		struct sc_pkcs15_object *object, struct pkcs15_any_object **skey_object)
+ {
++	struct pkcs15_any_object *any_object = NULL;
+ 	struct pkcs15_skey_object *skey = NULL;
+ 	int rv;
+ 
+-	rv = __pkcs15_create_object(fw_data, (struct pkcs15_any_object **) &skey,
++	rv = __pkcs15_create_object(fw_data, &any_object,
+ 			object, &pkcs15_skey_ops, sizeof(struct pkcs15_skey_object));
++        skey = (struct pkcs15_skey_object *) any_object;
+ 	if (rv >= 0)
+ 		skey->info = (struct sc_pkcs15_skey_info *) object->data;
+ 
+ 	if (skey_object != NULL)
+-		*skey_object = (struct pkcs15_any_object *) skey;
++		*skey_object = any_object;
+ 
+ 	return rv;
+ }
diff --git a/opensc.spec b/opensc.spec
index 786b307..a02e854 100644
--- a/opensc.spec
+++ b/opensc.spec
@@ -14,6 +14,7 @@ Source1:        opensc.module
 # https://github.com/OpenSC/OpenSC/blob/master/tests/common.sh
 Source2:        common.sh
 Patch1:         opensc-0.19.0-pinpad.patch
+# https://github.com/OpenSC/OpenSC/pull/2241/
 Patch5:         %{name}-gcc11.patch
 
 BuildRequires: make