diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-telit-lock-unlock-CSIM-operations-by-default.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-telit-lock-unlock-CSIM-operations-by-default.patch
new file mode 100644
index 000000000..07a55dbe2
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-telit-lock-unlock-CSIM-operations-by-default.patch
@@ -0,0 +1,144 @@
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Wed, 15 Mar 2017 00:03:35 +0100
+Subject: [PATCH] telit: lock/unlock CSIM operations by default
+
+Wrap the AT+CSIM=XX commands between lock (CSIM=1) and
+unlock (CSIM=0) operations.
+
+This seems to avoid the TTY lockup seen in several different Telit
+modules.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=100205
+
+Reported-by: Penalva, Salvador <Salvador.Penalva@digi.com>
+(cherry picked from commit 9384817a14c8706909f619e773a76edd65a0fdef)
+---
+ plugins/telit/mm-broadband-modem-telit.c | 69 +++++++++++++++++++++++++++++++-
+ 1 file changed, 68 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/telit/mm-broadband-modem-telit.c b/plugins/telit/mm-broadband-modem-telit.c
+index 8baf2cf..264dd58 100644
+--- a/plugins/telit/mm-broadband-modem-telit.c
++++ b/plugins/telit/mm-broadband-modem-telit.c
+@@ -278,8 +278,17 @@ modem_load_supported_bands (MMIfaceModem *self,
+ }
+ 
+ /*****************************************************************************/
+-/* Load unlock retries (Modem interface) */
++/* Load unlock retries (Modem interface)
++ *
++ * NOTE: the logic must make sure that LOAD_UNLOCK_RETRIES_STEP_UNLOCK is always
++ * run if LOAD_UNLOCK_RETRIES_STEP_LOCK has been run. Currently, the logic just
++ * runs all intermediate steps ignoring errors (i.e. not completing the
++ * operation if something fails), so the LOAD_UNLOCK_RETRIES_STEP_UNLOCK is
++ * always run.
++ */
+ 
++#define CSIM_LOCK_STR               "+CSIM=1"
++#define CSIM_UNLOCK_STR             "+CSIM=0"
+ #define CSIM_QUERY_PIN_RETRIES_STR  "+CSIM=10,0020000100"
+ #define CSIM_QUERY_PUK_RETRIES_STR  "+CSIM=10,002C000100"
+ #define CSIM_QUERY_PIN2_RETRIES_STR "+CSIM=10,0020008100"
+@@ -288,10 +297,12 @@ modem_load_supported_bands (MMIfaceModem *self,
+ 
+ typedef enum {
+     LOAD_UNLOCK_RETRIES_STEP_FIRST,
++    LOAD_UNLOCK_RETRIES_STEP_LOCK,
+     LOAD_UNLOCK_RETRIES_STEP_PIN,
+     LOAD_UNLOCK_RETRIES_STEP_PUK,
+     LOAD_UNLOCK_RETRIES_STEP_PIN2,
+     LOAD_UNLOCK_RETRIES_STEP_PUK2,
++    LOAD_UNLOCK_RETRIES_STEP_UNLOCK,
+     LOAD_UNLOCK_RETRIES_STEP_LAST
+ } LoadUnlockRetriesStep;
+ 
+@@ -328,6 +339,25 @@ modem_load_unlock_retries_finish (MMIfaceModem *self,
+ }
+ 
+ static void
++csim_unlock_ready (MMBaseModem              *self,
++                   GAsyncResult             *res,
++                   LoadUnlockRetriesContext *ctx)
++{
++    const gchar *response;
++    GError      *error = NULL;
++
++    /* Ignore errors */
++    response = mm_base_modem_at_command_finish (self, res, &error);
++    if (!response) {
++        mm_warn ("Couldn't unlock SIM card: %s", error->message);
++        g_error_free (error);
++    }
++
++    ctx->step++;
++    load_unlock_retries_step (ctx);
++}
++
++static void
+ csim_query_ready (MMBaseModem *self,
+                   GAsyncResult *res,
+                   LoadUnlockRetriesContext *ctx)
+@@ -370,6 +400,7 @@ csim_query_ready (MMBaseModem *self,
+             mm_unlock_retries_set (ctx->retries, MM_MODEM_LOCK_SIM_PUK2, unlock_retries);
+             break;
+         default:
++            g_assert_not_reached ();
+             break;
+     }
+ 
+@@ -379,12 +410,40 @@ next_step:
+ }
+ 
+ static void
++csim_lock_ready (MMBaseModem              *self,
++                 GAsyncResult             *res,
++                 LoadUnlockRetriesContext *ctx)
++{
++    const gchar *response;
++    GError      *error = NULL;
++
++    response = mm_base_modem_at_command_finish (self, res, &error);
++    if (!response) {
++        g_prefix_error (&error, "Couldn't lock SIM card: ");
++        g_simple_async_result_take_error (ctx->result, error);
++        load_unlock_retries_context_complete_and_free (ctx);
++        return;
++    }
++
++    ctx->step++;
++    load_unlock_retries_step (ctx);
++}
++
++static void
+ load_unlock_retries_step (LoadUnlockRetriesContext *ctx)
+ {
+     switch (ctx->step) {
+         case LOAD_UNLOCK_RETRIES_STEP_FIRST:
+             /* Fall back on next step */
+             ctx->step++;
++        case LOAD_UNLOCK_RETRIES_STEP_LOCK:
++            mm_base_modem_at_command (MM_BASE_MODEM (ctx->self),
++                                      CSIM_LOCK_STR,
++                                      CSIM_QUERY_TIMEOUT,
++                                      FALSE,
++                                      (GAsyncReadyCallback) csim_lock_ready,
++                                      ctx);
++            break;
+         case LOAD_UNLOCK_RETRIES_STEP_PIN:
+             mm_base_modem_at_command (MM_BASE_MODEM (ctx->self),
+                                       CSIM_QUERY_PIN_RETRIES_STR,
+@@ -417,6 +476,14 @@ load_unlock_retries_step (LoadUnlockRetriesContext *ctx)
+                                       (GAsyncReadyCallback) csim_query_ready,
+                                       ctx);
+             break;
++        case LOAD_UNLOCK_RETRIES_STEP_UNLOCK:
++            mm_base_modem_at_command (MM_BASE_MODEM (ctx->self),
++                                      CSIM_UNLOCK_STR,
++                                      CSIM_QUERY_TIMEOUT,
++                                      FALSE,
++                                      (GAsyncReadyCallback) csim_unlock_ready,
++                                      ctx);
++            break;
+         case LOAD_UNLOCK_RETRIES_STEP_LAST:
+             if (ctx->succeded_requests == 0) {
+                 g_simple_async_result_set_error (ctx->result,
diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
index c490ec1bb..4b9ab0d6c 100644
--- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
@@ -2,7 +2,10 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI += "file://cellularifupdown"
+SRC_URI += " \
+    file://cellularifupdown \
+    file://0001-telit-lock-unlock-CSIM-operations-by-default.patch \
+"
 
 # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So
 # remove 'polkit' support to be able to build ModemManager on a framebuffer