diff --git a/app.te b/app.te
index de7b7d05daadadbb408a60cb8815f137e6eb5d15..cb8091b64195372cb07f65911d26d0eb312e4025 100644
--- a/app.te
+++ b/app.te
@@ -89,8 +89,8 @@ net_domain(browser_app)
 allow platformappdomain platform_app_data_file:dir create_dir_perms;
 allow platformappdomain platform_app_data_file:notdevfile_class_set create_file_perms;
 # App sdcard file accesses
-allow platformappdomain sdcard:dir create_dir_perms;
-allow platformappdomain sdcard:file create_file_perms;
+allow platformappdomain sdcard_type:dir create_dir_perms;
+allow platformappdomain sdcard_type:file create_file_perms;
 # System data file accesses (e.g, shared objects from the lib directory)
 allow platformappdomain system_data_file:file { execute open };
 
@@ -119,11 +119,17 @@ if (app_bluetooth or android_cts) {
 # No specific SELinux class for bluetooth sockets presently.
 allow untrusted_app self:socket *;
 }
-# SDCard rw access.
-bool app_sdcard_rw true;
-if (app_sdcard_rw) {
-allow untrusted_app sdcard:dir create_dir_perms;
-allow untrusted_app sdcard:file create_file_perms;
+# Internal SDCard rw access.
+bool app_internal_sdcard_rw true;
+if (app_internal_sdcard_rw) {
+allow untrusted_app sdcard_internal:dir create_dir_perms;
+allow untrusted_app sdcard_internal:file create_file_perms;
+}
+# External SDCard rw access.
+bool app_external_sdcard_rw true;
+if (app_external_sdcard_rw) {
+allow untrusted_app sdcard_external:dir create_dir_perms;
+allow untrusted_app sdcard_external:file create_file_perms;
 }
 # Native app support.
 bool app_ndk false;
diff --git a/attributes b/attributes
index ef4a1708e75ba011e9e35c8b78927010a40b029a..7d491e2d4ea7c4faf8ae71bebd0f1fdee292d10b 100644
--- a/attributes
+++ b/attributes
@@ -24,6 +24,9 @@ attribute data_file_type;
 # All types use for sysfs files.
 attribute sysfs_type;
 
+# Attribute used for all sdcards
+attribute sdcard_type;
+
 # All types used for nodes/hosts.
 attribute node_type;
 
diff --git a/drmserver.te b/drmserver.te
index 63286d55822f284c5379aa07d8374a8f9fafe9c1..dcf3cc9527a3b00a9041babe35fd26c72ad259e0 100644
--- a/drmserver.te
+++ b/drmserver.te
@@ -14,7 +14,7 @@ binder_service(drmserver)
 # Perform Binder IPC to mediaserver
 binder_call(drmserver, mediaserver)
 
-allow drmserver sdcard:dir search;
+allow drmserver sdcard_type:dir search;
 allow drmserver drm_data_file:dir create_dir_perms;
 allow drmserver drm_data_file:file create_file_perms;
 allow drmserver self:{ tcp_socket udp_socket } *;
diff --git a/file.te b/file.te
index 484b8fe742ab05ffcbe83f1d08ffbb413bfe4e2d..65788df5bcb1d678e824c075ff9c43e07e107ba5 100644
--- a/file.te
+++ b/file.te
@@ -16,7 +16,8 @@ type devpts, fs_type, mlstrustedobject;
 type tmpfs, fs_type;
 type shm, fs_type;
 type mqueue, fs_type;
-type sdcard, fs_type, mlstrustedobject;
+type sdcard_internal, sdcard_type, fs_type, mlstrustedobject;
+type sdcard_external, sdcard_type, fs_type, mlstrustedobject;
 type debugfs, fs_type, mlstrustedobject;
 
 # File types
diff --git a/genfs_contexts b/genfs_contexts
index ff633a76be5fb0c4faa793385d4693f931a1d090..2607b9dabf9e1a9cedb8ba9ea8688297d2a9d627 100644
--- a/genfs_contexts
+++ b/genfs_contexts
@@ -9,6 +9,6 @@ genfscon cgroup / u:object_r:cgroup:s0
 # sysfs labels can be set by userspace.
 genfscon sysfs / u:object_r:sysfs:s0
 genfscon inotifyfs / u:object_r:inotify:s0
-genfscon vfat / u:object_r:sdcard:s0
+genfscon vfat / u:object_r:sdcard_external:s0
 genfscon debugfs / u:object_r:debugfs:s0
-genfscon fuse / u:object_r:sdcard:s0
+genfscon fuse / u:object_r:sdcard_internal:s0
diff --git a/mediaserver.te b/mediaserver.te
index f941c6a63ebd279e261736e4028eb0529a3b3a16..0696331cd3e0df5abb0290dde8da3a7b63eb0e74 100644
--- a/mediaserver.te
+++ b/mediaserver.te
@@ -8,7 +8,7 @@ net_domain(mediaserver)
 init_daemon_domain(mediaserver)
 unix_socket_connect(mediaserver, property, init)
 
-r_dir_file(mediaserver, sdcard)
+r_dir_file(mediaserver, sdcard_type)
 
 binder_use(mediaserver)
 binder_call(mediaserver, binderservicedomain)
@@ -18,7 +18,7 @@ binder_service(mediaserver)
 allow mediaserver kernel:system module_request;
 allow mediaserver app_data_file:dir search;
 allow mediaserver app_data_file:file r_file_perms;
-allow mediaserver sdcard:file write;
+allow mediaserver sdcard_type:file write;
 allow mediaserver camera_device:chr_file rw_file_perms;
 allow mediaserver graphics_device:chr_file rw_file_perms;
 allow mediaserver video_device:chr_file rw_file_perms;
diff --git a/rild.te b/rild.te
index 917634807475dd11071e0585bf55f5a5c0948aa5..c331bb327d25cca72da65b1ae9088bae009e634b 100644
--- a/rild.te
+++ b/rild.te
@@ -23,7 +23,7 @@ allow rild bluetooth_efs_file:dir r_dir_perms;
 allow rild radio_data_file:dir r_dir_perms;
 allow rild radio_data_file:file rw_file_perms;
 allow rild radio_device:lnk_file r_file_perms;
-allow rild sdcard:dir r_dir_perms;
+allow rild sdcard_type:dir r_dir_perms;
 allow rild system_data_file:dir create_dir_perms;
 allow rild system_data_file:file create_file_perms;
 allow rild system_file:file x_file_perms;
diff --git a/sdcardd.te b/sdcardd.te
index 1281ae4feaf75a520d73f9670816e71f62cfcd98..4445183a0a0a37ce37d680f2a1662fd01c37b78b 100644
--- a/sdcardd.te
+++ b/sdcardd.te
@@ -6,7 +6,7 @@ init_daemon_domain(sdcardd)
 allow sdcardd cgroup:dir create_dir_perms;
 allow sdcardd fuse_device:chr_file rw_file_perms;
 allow sdcardd rootfs:dir mounton;
-allow sdcardd sdcard:filesystem mount;
+allow sdcardd sdcard_type:filesystem mount;
 allow sdcardd self:capability { setuid setgid dac_override sys_admin };
 allow sdcardd system_data_file:dir  create_dir_perms;
 allow sdcardd system_data_file:file create_file_perms;
diff --git a/shell.te b/shell.te
index 5b4d843e21b045e686571290edb29fa2db3c0336..bf9ee44a5d1d7709f1a73b8cd791bb3ed89ff8bd 100644
--- a/shell.te
+++ b/shell.te
@@ -13,8 +13,8 @@ allow shell shell_data_file:file create_file_perms;
 allow shell shell_data_file:file rx_file_perms;
 
 # Access sdcard.
-allow shell sdcard:dir rw_dir_perms;
-allow shell sdcard:file create_file_perms;
+allow shell sdcard_type:dir rw_dir_perms;
+allow shell sdcard_type:file create_file_perms;
 
 r_dir_file(shell, apk_data_file)
 allow shell dalvikcache_data_file:file write;
diff --git a/system.te b/system.te
index a872516596adca972fa35df904212b5ff08070dc..62240feb919701f7eb27fea9a7d8ba5b41979253 100644
--- a/system.te
+++ b/system.te
@@ -28,7 +28,7 @@ selinux_getenforce(system)
 selinux_getenforce(system_app)
 
 # Settings app reads sdcard for storage stats
-allow system_app sdcard:dir r_dir_perms;
+allow system_app sdcard_type:dir r_dir_perms;
 
 bool manage_selinux true;
 if (manage_selinux) {
diff --git a/vold.te b/vold.te
index 60d6a37296f1a2c8c3c343d0c441b8f98bdaf607..c1b9055035a9a126b33a747f15052113e1ee7053 100644
--- a/vold.te
+++ b/vold.te
@@ -10,9 +10,9 @@ allow vold block_device:blk_file create_file_perms;
 allow vold block_device:lnk_file read;
 allow vold devpts:chr_file rw_file_perms;
 allow vold rootfs:dir mounton;
-allow vold sdcard:dir mounton;
-allow vold sdcard:filesystem { mount remount unmount };
-allow vold sdcard:dir create_dir_perms;
+allow vold sdcard_type:dir mounton;
+allow vold sdcard_type:filesystem { mount remount unmount };
+allow vold sdcard_type:dir create_dir_perms;
 allow vold tmpfs:filesystem { mount unmount };
 allow vold tmpfs:dir create_dir_perms;
 allow vold tmpfs:dir mounton;
diff --git a/zygote.te b/zygote.te
index 743af36d4a75c980c9c289e6814915229a41792d..24e4189e0b4e331ffe2ddb561fd8510e9f8a94ae 100644
--- a/zygote.te
+++ b/zygote.te
@@ -33,7 +33,7 @@ allow zygote rootfs:file r_file_perms;
 
 # Setting up /storage/emulated.
 allow zygote rootfs:dir mounton;
-allow zygote sdcard:dir { write search setattr create add_name mounton };
+allow zygote sdcard_type:dir { write search setattr create add_name mounton };
 dontaudit zygote self:capability fsetid;
 allow zygote tmpfs:dir { write create add_name setattr mounton };
 allow zygote tmpfs:filesystem mount;