diff --git a/policy/modules/contrib/cron.te b/policy/modules/contrib/cron.te
index 20eac02070..959e6d2a59 100644
--- a/policy/modules/contrib/cron.te
+++ b/policy/modules/contrib/cron.te
@@ -326,11 +326,6 @@ optional_policy(`
apache_search_sys_content(crond_t)
')
-optional_policy(`
- djbdns_search_tinydns_keys(crond_t)
- djbdns_link_tinydns_keys(crond_t)
-')
-
optional_policy(`
locallogin_search_keys(crond_t)
locallogin_link_keys(crond_t)
diff --git a/policy/modules/contrib/djbdns.fc b/policy/modules/contrib/djbdns.fc
deleted file mode 100644
index e9b1b32a80..0000000000
--- a/policy/modules/contrib/djbdns.fc
+++ /dev/null
@@ -1,7 +0,0 @@
-/usr/bin/axfrdns -- gen_context(system_u:object_r:djbdns_axfrdns_exec_t,s0)
-/usr/bin/dnscache -- gen_context(system_u:object_r:djbdns_dnscache_exec_t,s0)
-/usr/bin/tinydns -- gen_context(system_u:object_r:djbdns_tinydns_exec_t,s0)
-
-/var/axfrdns/root(/.*)? gen_context(system_u:object_r:djbdns_axfrdns_conf_t,s0)
-/var/dnscache/root(/.*)? gen_context(system_u:object_r:djbdns_dnscache_conf_t,s0)
-/var/tinydns/root(/.*)? gen_context(system_u:object_r:djbdns_tinydns_conf_t,s0)
diff --git a/policy/modules/contrib/djbdns.if b/policy/modules/contrib/djbdns.if
deleted file mode 100644
index 6d36c951a3..0000000000
--- a/policy/modules/contrib/djbdns.if
+++ /dev/null
@@ -1,95 +0,0 @@
-## Small and secure DNS daemon.
-
-#######################################
-##
-## The template to define a djbdns domain.
-##
-##
-##
-## Domain prefix to be used.
-##
-##
-#
-template(`djbdns_daemontools_domain_template',`
- gen_require(`
- attribute djbdns_domain;
- ')
-
- ########################################
- #
- # Declarations
- #
-
- type djbdns_$1_t, djbdns_domain;
- type djbdns_$1_exec_t;
- domain_type(djbdns_$1_t)
- domain_entry_file(djbdns_$1_t, djbdns_$1_exec_t)
- role system_r types djbdns_$1_t;
-
- type djbdns_$1_conf_t;
- files_config_file(djbdns_$1_conf_t)
-
- ########################################
- #
- # Local policy
- #
-
- daemontools_service_domain(djbdns_$1_t, djbdns_$1_exec_t)
- daemontools_read_svc(djbdns_$1_t)
-
- allow djbdns_$1_t djbdns_$1_conf_t:dir list_dir_perms;
- allow djbdns_$1_t djbdns_$1_conf_t:file read_file_perms;
-
- corenet_all_recvfrom_netlabel(djbdns_$1_t)
- corenet_tcp_sendrecv_generic_if(djbdns_$1_t)
- corenet_udp_sendrecv_generic_if(djbdns_$1_t)
- corenet_tcp_sendrecv_generic_node(djbdns_$1_t)
- corenet_udp_sendrecv_generic_node(djbdns_$1_t)
- corenet_tcp_sendrecv_all_ports(djbdns_$1_t)
- corenet_udp_sendrecv_all_ports(djbdns_$1_t)
- corenet_tcp_bind_generic_node(djbdns_$1_t)
- corenet_udp_bind_generic_node(djbdns_$1_t)
- corenet_tcp_bind_dns_port(djbdns_$1_t)
- corenet_udp_bind_dns_port(djbdns_$1_t)
- corenet_udp_bind_generic_port(djbdns_$1_t)
- corenet_sendrecv_dns_server_packets(djbdns_$1_t)
- corenet_sendrecv_generic_server_packets(djbdns_$1_t)
-
- files_search_var(djbdns_$1_t)
-')
-
-#####################################
-##
-## Search djbdns-tinydns key ring.
-##
-##
-##
-## Domain allowed access.
-##
-##
-#
-interface(`djbdns_search_tinydns_keys',`
- gen_require(`
- type djbdns_tinydns_t;
- ')
-
- allow $1 djbdns_tinydns_t:key search;
-')
-
-#####################################
-##
-## Link djbdns-tinydns key ring.
-##
-##
-##
-## Domain allowed access.
-##
-##
-#
-interface(`djbdns_link_tinydns_keys',`
- gen_require(`
- type djbdns_tinydn_t;
- ')
-
- allow $1 djbdns_tinydn_t:key link;
-')
diff --git a/policy/modules/contrib/djbdns.te b/policy/modules/contrib/djbdns.te
deleted file mode 100644
index ebd327ad1a..0000000000
--- a/policy/modules/contrib/djbdns.te
+++ /dev/null
@@ -1,68 +0,0 @@
-policy_module(djbdns, 1.6.0)
-
-########################################
-#
-# Declarations
-#
-
-attribute djbdns_domain;
-
-djbdns_daemontools_domain_template(axfrdns)
-ucspitcp_service_domain(djbdns_axfrdns_t, djbdns_axfrdns_exec_t)
-
-djbdns_daemontools_domain_template(dnscache)
-djbdns_daemontools_domain_template(tinydns)
-
-########################################
-#
-# Common local policy
-#
-
-allow djbdns_domain self:capability { setgid setuid sys_chroot };
-allow djbdns_domain self:process signal;
-allow djbdns_domain self:fifo_file rw_fifo_file_perms;
-allow djbdns_domain self:tcp_socket create_stream_socket_perms;
-allow djbdns_domain self:udp_socket create_socket_perms;
-
-corenet_all_recvfrom_unlabeled(djbdns_domain)
-corenet_all_recvfrom_netlabel(djbdns_domain)
-corenet_tcp_sendrecv_generic_if(djbdns_domain)
-corenet_udp_sendrecv_generic_if(djbdns_domain)
-corenet_tcp_sendrecv_generic_node(djbdns_domain)
-corenet_udp_sendrecv_generic_node(djbdns_domain)
-corenet_tcp_sendrecv_all_ports(djbdns_domain)
-corenet_udp_sendrecv_all_ports(djbdns_domain)
-corenet_tcp_bind_generic_node(djbdns_domain)
-corenet_udp_bind_generic_node(djbdns_domain)
-
-corenet_sendrecv_dns_server_packets(djbdns_domain)
-corenet_tcp_bind_dns_port(djbdns_domain)
-corenet_udp_bind_dns_port(djbdns_domain)
-
-corenet_sendrecv_dns_client_packets(djbdns_domain)
-corenet_tcp_connect_dns_port(djbdns_domain)
-
-corenet_sendrecv_generic_server_packets(djbdns_domain)
-corenet_tcp_bind_generic_port(djbdns_domain)
-corenet_udp_bind_generic_port(djbdns_domain)
-
-files_search_var(djbdns_domain)
-
-daemontools_ipc_domain(djbdns_axfrdns_t)
-daemontools_read_svc(djbdns_axfrdns_t)
-
-
-########################################
-#
-# axfrdns local policy
-#
-
-allow djbdns_axfrdns_t { djbdns_tinydns_t djbdns_tinydns_conf_t }:dir list_dir_perms;
-allow djbdns_axfrdns_t { djbdns_tinydns_t djbdns_tinydns_conf_t }:file read_file_perms;
-
-########################################
-#
-# tinydns local policy
-#
-
-init_dontaudit_use_script_fds(djbdns_tinydns_t)