diff --git a/refpolicy/policy/modules/kernel/files.if b/refpolicy/policy/modules/kernel/files.if
index a467391..667fbd3 100644
--- a/refpolicy/policy/modules/kernel/files.if
+++ b/refpolicy/policy/modules/kernel/files.if
@@ -3807,6 +3807,27 @@ interface(`files_manage_generic_spool',`
 
 ########################################
 ## <summary>
+##	Create objects in the spool directory
+##	with a private type with a type transition.
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`files_spool_filetrans',`
+	gen_require(`
+		type var_t, var_spool_t;
+	')
+
+	allow $1 var_t:dir search_dir_perms;
+	allow $1 var_spool_t:dir rw_dir_perms;
+	type_transition $1 var_spool_t:$3 $2;
+')
+
+########################################
+## <summary>
 ##	Allow access to manage all polyinstantiated
 ##	directories on the system.
 ## </summary>
diff --git a/refpolicy/policy/modules/kernel/files.te b/refpolicy/policy/modules/kernel/files.te
index a7faa68..09d96c5 100644
--- a/refpolicy/policy/modules/kernel/files.te
+++ b/refpolicy/policy/modules/kernel/files.te
@@ -1,5 +1,5 @@
 
-policy_module(files,1.2.5)
+policy_module(files,1.2.6)
 
 ########################################
 #
diff --git a/refpolicy/policy/modules/services/uptime.fc b/refpolicy/policy/modules/services/uptime.fc
new file mode 100644
index 0000000..1f22545
--- /dev/null
+++ b/refpolicy/policy/modules/services/uptime.fc
@@ -0,0 +1,6 @@
+
+/etc/uptimed\.conf	--	gen_context(system_u:object_r:uptimed_etc_t,s0)
+
+/usr/sbin/uptimed	--	gen_context(system_u:object_r:uptimed_exec_t,s0)
+
+/var/spool/uptimed(/.*)?        gen_context(system_u:object_r:uptimed_spool_t,s0)
diff --git a/refpolicy/policy/modules/services/uptime.if b/refpolicy/policy/modules/services/uptime.if
new file mode 100644
index 0000000..447abf7
--- /dev/null
+++ b/refpolicy/policy/modules/services/uptime.if
@@ -0,0 +1 @@
+## <summary>Uptime daemon</summary>
diff --git a/refpolicy/policy/modules/services/uptime.te b/refpolicy/policy/modules/services/uptime.te
new file mode 100644
index 0000000..0e02460
--- /dev/null
+++ b/refpolicy/policy/modules/services/uptime.te
@@ -0,0 +1,90 @@
+
+policy_module(uptime,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type uptimed_t;
+type uptimed_exec_t;
+init_daemon_domain(uptimed_t,uptimed_exec_t)
+
+type uptimed_etc_t alias etc_uptimed_t;
+files_config_file(uptimed_etc_t)
+
+type uptimed_spool_t;
+files_type(uptimed_spool_t)
+
+type uptimed_var_run_t;
+files_pid_file(uptimed_var_run_t)
+
+########################################
+#
+# Local policy
+#
+
+dontaudit uptimed_t self:capability sys_tty_config;
+allow uptimed_t self:process signal_perms;
+allow uptimed_t self:fifo_file { getattr write };
+
+allow uptimed_t uptimed_etc_t:file { getattr read };
+files_search_etc(uptimed_t)
+
+allow uptimed_t uptimed_spool_t:file manage_file_perms;
+
+allow uptimed_t uptimed_var_run_t:file manage_file_perms;
+allow uptimed_t uptimed_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(uptimed_t,uptimed_var_run_t,file)
+
+allow uptimed_t uptimed_spool_t:dir manage_dir_perms;
+allow uptimed_t uptimed_spool_t:file manage_file_perms;
+files_spool_filetrans(uptimed_t,uptimed_spool_t,{ dir file })
+
+kernel_read_system_state(uptimed_t)
+kernel_read_kernel_sysctls(uptimed_t)
+
+corecmd_exec_shell(uptimed_t)
+corecmd_search_sbin(uptimed_t)
+
+dev_read_sysfs(uptimed_t)
+
+domain_use_interactive_fds(uptimed_t)
+
+files_read_etc_runtime_files(uptimed_t)
+
+fs_getattr_all_fs(uptimed_t)
+fs_search_auto_mountpoints(uptimed_t)
+
+term_dontaudit_use_console(uptimed_t)
+
+init_use_fds(uptimed_t)
+init_use_script_ptys(uptimed_t)
+
+libs_use_ld_so(uptimed_t)
+libs_use_shared_libs(uptimed_t)
+
+logging_send_syslog_msg(uptimed_t)
+
+miscfiles_read_localization(uptimed_t)
+
+userdom_dontaudit_use_unpriv_user_fds(uptimed_t)
+userdom_dontaudit_search_sysadm_home_dirs(uptimed_t)
+
+ifdef(`targeted_policy',`
+	term_dontaudit_use_unallocated_ttys(uptimed_t)
+	term_dontaudit_use_generic_ptys(uptimed_t)
+	files_dontaudit_read_root_files(uptimed_t)
+')
+
+optional_policy(`
+	mta_send_mail(uptimed_t)
+')
+
+optional_policy(`
+	seutil_sigchld_newrole(uptimed_t)
+')
+
+optional_policy(`
+	udev_read_db(uptimed_t)
+')