diff --git a/doc/spec/hal-spec-access-control.xml b/doc/spec/hal-spec-access-control.xml
index b33bd18..ec790e8 100644
--- a/doc/spec/hal-spec-access-control.xml
+++ b/doc/spec/hal-spec-access-control.xml
@@ -138,6 +138,14 @@
             </row>
             <row>
               <entry>
+                <literal>iso7816</literal>
+              </entry>
+              <entry>Directly access iso7816 security devices.</entry>
+	      <entry>no</entry>
+	      <entry>yes</entry>
+            </row>
+            <row>
+              <entry>
                 <literal>joystick</literal>
               </entry>
               <entry>Directly access Joystick devices.</entry>
diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 3c400ef..114cb47 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4780,6 +4780,40 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
       </informaltable>
     </sect2>
 
+    <sect2 id="device-properties-iso7816">
+      <title>
+        iso7816 namespace
+      </title>
+      <para>
+	Device objects with the capability <literal>iso7816</literal> represent
+	a smart card device/systems (e.g. smart card reader) . No namespace specific
+        properties.
+      </para>
+    </sect2>
+
+    <sect2 id="device-properties-iso7816-smart-card-reader">
+      <title>
+        iso7816.smart_card_reader namespace
+      </title>
+      <para>
+	Device objects with the capabilities <literal>iso7816</literal> and <literal>
+	iso7816.smart_card_reader represent a smart card reader. No namespace specific
+        properties.
+      </para>
+    </sect2>
+
+    <sect2 id="device-properties-iso7816-smart-token">
+      <title>
+        iso7816.smart_token namespace
+      </title>
+      <para>
+	Device objects with the capabilities <literal>iso7816</literal> and <literal>
+	iso7816.smart_token represent a smart token, a device where the smart card and the 
+	smart card reader are in one device. No namespace specific
+        properties.
+      </para>
+    </sect2>
+
     <sect2 id="device-properties-killswitch">
       <title>
         killswitch namespace
diff --git a/fdi/policy/10osvendor/20-acl-management.fdi b/fdi/policy/10osvendor/20-acl-management.fdi
index 98f8c88..236904a 100644
--- a/fdi/policy/10osvendor/20-acl-management.fdi
+++ b/fdi/policy/10osvendor/20-acl-management.fdi
@@ -115,6 +115,11 @@
 	  <merge key="access_control.file" type="copy_property">usbraw.device</merge>
 	  <merge key="access_control.type" type="string">fingerprint-reader</merge>
         </match>
+        <match key="info.capabilities" sibling_contains="iso7816">
+	  <addset key="info.capabilities" type="strlist">access_control</addset>
+	  <merge key="access_control.file" type="copy_property">usbraw.device</merge>
+	  <merge key="access_control.type" type="string">iso7816</merge>
+        </match>
       </match>
     </match>
 
@@ -146,6 +151,11 @@
           <merge key="access_control.type" type="string">fingerprint-reader</merge>
           <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
         </match>
+        <match key="info.capabilities" contains="iso7816">
+          <addset key="info.capabilities" type="strlist">access_control</addset>
+          <merge key="access_control.type" type="string">iso7816</merge>
+          <merge key="access_control.file" type="copy_property">@info.parent:linux.device_file</merge>
+        </match>
       </match>
     </match>
 
diff --git a/policy/org.freedesktop.hal.device-access.policy b/policy/org.freedesktop.hal.device-access.policy
index e083eb4..a0396c9 100644
--- a/policy/org.freedesktop.hal.device-access.policy
+++ b/policy/org.freedesktop.hal.device-access.policy
@@ -91,6 +91,15 @@ NOTE: Please keep the actions in alpabetical order
     </defaults>
   </action>
 
+  <action id="org.freedesktop.hal.device-access.iso7816">
+    <description>Directly access to iso7816 security devices</description>
+    <message>System policy prevents access to iso7816 security devices</message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
   <action id="org.freedesktop.hal.device-access.joystick">
     <description>Directly access Joystick devices</description>
     <message>System policy prevents access to Joystick devices</message>