diff --git a/inc/mtp.h b/inc/mtp.h
index 3a2f4aa..ff0296b 100644
--- a/inc/mtp.h
+++ b/inc/mtp.h
@@ -83,6 +83,7 @@ typedef struct mtp_storage_
 	uint32_t flags;
 }mtp_storage;
 
+#define UMTP_STORAGE_REMOVABLE   0x00000004
 #define UMTP_STORAGE_NOTMOUNTED  0x00000002
 #define UMTP_STORAGE_READONLY    0x00000001
 #define UMTP_STORAGE_READWRITE   0x00000000
diff --git a/src/mtp_cfg.c b/src/mtp_cfg.c
index af7e8d3..1df7fa1 100644
--- a/src/mtp_cfg.c
+++ b/src/mtp_cfg.c
@@ -275,6 +275,11 @@ static int get_storage_params(mtp_ctx * context, char * line,int cmd)
 			{
 				flags |= UMTP_STORAGE_NOTMOUNTED;
 			}
+
+			if(test_flag(options, "removable"))
+			{
+				flags |= UMTP_STORAGE_REMOVABLE;
+			}
 		}
 
 		PRINT_MSG("Add storage %s - Root Path: %s - Flags: 0x%.8X", storagename, storagepath,flags);
diff --git a/src/mtp_datasets.c b/src/mtp_datasets.c
index 3a1ab3b..e27d74b 100644
--- a/src/mtp_datasets.c
+++ b/src/mtp_datasets.c
@@ -108,6 +108,7 @@ int build_storageinfo_dataset(mtp_ctx * ctx,void * buffer, int maxsize,uint32_t
 	uint64_t freespace = 0x4000000000000000U;
 	uint64_t totalspace = 0x8000000000000000U;
 	uint32_t storage_flags;
+	uint16_t storage_type;
 
 	ofs = 0;
 
@@ -115,10 +116,15 @@ int build_storageinfo_dataset(mtp_ctx * ctx,void * buffer, int maxsize,uint32_t
 	storage_path = mtp_get_storage_root(ctx, storageid);
 	storage_flags = mtp_get_storage_flags(ctx, storageid);
 
+	if (storage_flags & UMTP_STORAGE_REMOVABLE)
+		storage_type = MTP_STORAGE_REMOVABLE_RAM;
+	else
+		storage_type = MTP_STORAGE_FIXED_RAM;
+
 	if(storage_description && storage_path)
 	{
 		PRINT_DEBUG("Add storageinfo for %s", storage_path);
-		ofs = poke16(buffer, ofs, maxsize, MTP_STORAGE_FIXED_RAM);                               // Storage Type
+		ofs = poke16(buffer, ofs, maxsize, storage_type);                                        // Storage Type
 		ofs = poke16(buffer, ofs, maxsize, MTP_STORAGE_FILESYSTEM_HIERARCHICAL);                 // Filesystem Type
 
 		// Access Capability