diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index b7604488f7d..b7f2b6d72bc 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-22  Ilya Verbin  <ilya.verbin@intel.com>
+
+	* target.c (gomp_get_target_fn_addr): Allow host fallback if target
+	function wasn't mapped to the device with non-shared memory.
+
 2016-01-20  Ilya Verbin  <ilya.verbin@intel.com>
 
 	* task.c (gomp_create_target_task): Set firstprivate_copies to NULL.
diff --git a/libgomp/target.c b/libgomp/target.c
index f1f58492ee5..96fe3d5eb0d 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -1436,12 +1436,7 @@ gomp_get_target_fn_addr (struct gomp_device_descr *devicep,
       splay_tree_key tgt_fn = splay_tree_lookup (&devicep->mem_map, &k);
       gomp_mutex_unlock (&devicep->lock);
       if (tgt_fn == NULL)
-	{
-	  if (devicep->capabilities & GOMP_OFFLOAD_CAP_SHARED_MEM)
-	    return NULL;
-	  else
-	    gomp_fatal ("Target function wasn't mapped");
-	}
+	return NULL;
 
       return (void *) tgt_fn->tgt_offset;
     }