diff --git a/policy-20071130.patch b/policy-20071130.patch
index f73aa1c..82d3eb7 100644
--- a/policy-20071130.patch
+++ b/policy-20071130.patch
@@ -7763,16 +7763,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.te serefpolicy-3.3.1/policy/modules/kernel/files.te
 --- nsaserefpolicy/policy/modules/kernel/files.te	2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/kernel/files.te	2008-04-23 09:58:10.094098000 -0400
-@@ -6,7 +6,7 @@
- # Declarations
- #
- 
--attribute file_type;
-+attribute file_typep;
- attribute files_unconfined_type;
- attribute lockfile;
- attribute mountpoint;
++++ serefpolicy-3.3.1/policy/modules/kernel/files.te	2008-04-23 15:35:25.733975000 -0400
 @@ -50,11 +50,15 @@
  #
  # etc_t is the type of the system etc directories.
@@ -8674,13 +8665,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amav
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/amavis.te serefpolicy-3.3.1/policy/modules/services/amavis.te
 --- nsaserefpolicy/policy/modules/services/amavis.te	2008-02-18 14:30:18.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/amavis.te	2008-04-23 10:04:14.242721000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/amavis.te	2008-04-23 15:44:23.414526000 -0400
 @@ -13,7 +13,7 @@
  
  # configuration files
  type amavis_etc_t;
 -files_type(amavis_etc_t)
-+files_config_type(amavis_etc_t)
++files_config_file(amavis_etc_t)
  
  # pid files
  type amavis_var_run_t;
@@ -11325,13 +11316,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clam
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/clamav.te serefpolicy-3.3.1/policy/modules/services/clamav.te
 --- nsaserefpolicy/policy/modules/services/clamav.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/clamav.te	2008-04-23 10:04:39.473543000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/clamav.te	2008-04-23 15:44:28.165531000 -0400
 @@ -13,7 +13,7 @@
  
  # configuration files
  type clamd_etc_t;
 -files_type(clamd_etc_t)
-+files_config_type(clamd_etc_t)
++files_config_file(clamd_etc_t)
  
  # tmp files
  type clamd_tmp_t;
@@ -11542,13 +11533,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cons
 +
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/courier.te serefpolicy-3.3.1/policy/modules/services/courier.te
 --- nsaserefpolicy/policy/modules/services/courier.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/courier.te	2008-04-23 10:04:46.608514000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/courier.te	2008-04-23 15:44:33.699904000 -0400
 @@ -9,7 +9,7 @@
  courier_domain_template(authdaemon)
  
  type courier_etc_t;
 -files_type(courier_etc_t)
-+files_config_type(courier_etc_t)
++files_config_file(courier_etc_t)
  
  courier_domain_template(pcp)
  
@@ -13340,7 +13331,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-3.3.1/policy/modules/services/dbus.te
 --- nsaserefpolicy/policy/modules/services/dbus.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/dbus.te	2008-04-23 10:04:59.092928000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/dbus.te	2008-04-23 15:44:38.592767000 -0400
 @@ -9,9 +9,10 @@
  #
  # Delcarations
@@ -13349,7 +13340,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus
  
  type dbusd_etc_t alias etc_dbusd_t;
 -files_type(dbusd_etc_t)
-+files_config_type(dbusd_etc_t)
++files_config_file(dbusd_etc_t)
  
  type system_dbusd_t alias dbusd_t;
  type system_dbusd_exec_t;
@@ -13741,13 +13732,13 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddcl
 +')
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ddclient.te serefpolicy-3.3.1/policy/modules/services/ddclient.te
 --- nsaserefpolicy/policy/modules/services/ddclient.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/ddclient.te	2008-04-23 10:05:05.276779000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/ddclient.te	2008-04-23 15:44:44.645621000 -0400
 @@ -11,7 +11,7 @@
  init_daemon_domain(ddclient_t,ddclient_exec_t)
  
  type ddclient_etc_t;
 -files_type(ddclient_etc_t)
-+files_config_type(ddclient_etc_t)
++files_config_file(ddclient_etc_t)
  
  type ddclient_log_t;
  logging_log_file(ddclient_log_t)
@@ -19262,7 +19253,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  # Local Policy
 diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/postfix.te serefpolicy-3.3.1/policy/modules/services/postfix.te
 --- nsaserefpolicy/policy/modules/services/postfix.te	2007-12-19 05:32:17.000000000 -0500
-+++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2008-04-23 10:08:07.243535000 -0400
++++ serefpolicy-3.3.1/policy/modules/services/postfix.te	2008-04-23 15:05:37.257075000 -0400
 @@ -6,6 +6,14 @@
  # Declarations
  #
@@ -19292,7 +19283,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/post
  mta_mailserver_delivery(postfix_local_t)
  
 +tunable_policy(`allow_postfix_local_write_mail_spool', `
-+	mta_rw_spool(postfix_local_t)
++	mta_manage_spool(postfix_local_t)
 +')
 +
  type postfix_local_tmp_t;