diff --git a/refpolicy/policy/modules/kernel/devices.if b/refpolicy/policy/modules/kernel/devices.if
index afe9f5f8e..3d2c5e4f0 100644
--- a/refpolicy/policy/modules/kernel/devices.if
+++ b/refpolicy/policy/modules/kernel/devices.if
@@ -7,14 +7,14 @@
 define(`devices_make_device_node',`
 requires_block_template(`$0'_depend)
 typeattribute $1 device_node;
-filesystem_associate($1,optional)
-filesystem_tmpfs_associate($1,optional)
+filesystem_associate($1)
+optional_policy(`distro_redhat',`
+filesystem_tmpfs_associate($1)
+')
 ')
 
 define(`devices_make_device_node_depend',`
 attribute device_node;
-filesystem_associate_depend
-filesystem_tmpfs_associate_depend
 ')
 
 ########################################
@@ -226,6 +226,9 @@ define(`devices_create_dev_entry',`
 requires_block_template(`$0'_depend)
 allow $1 device_t:dir { getattr search read write add_name remove_name };
 type_transition $1 device_t:$3 $2;
+optional_policy(`distro_redhat',`
+filesystem_tmpfs_associate($2)
+')
 ')
 
 define(`devices_set_dev_entry_depend',`