diff --git a/refpolicy/Changelog b/refpolicy/Changelog
index 7f0ca9dff..c30a277b2 100644
--- a/refpolicy/Changelog
+++ b/refpolicy/Changelog
@@ -44,6 +44,7 @@
 	ethereal
 	evolution
 	games
+	jabber
 	mozilla
 	mplayer
 	nagios
diff --git a/refpolicy/policy/modules/services/jabber.fc b/refpolicy/policy/modules/services/jabber.fc
new file mode 100644
index 000000000..06ea7468d
--- /dev/null
+++ b/refpolicy/policy/modules/services/jabber.fc
@@ -0,0 +1,4 @@
+/usr/sbin/jabberd	--	gen_context(system_u:object_r:jabberd_exec_t,s0)
+
+/var/lib/jabber(/.*)?		gen_context(system_u:object_r:jabberd_var_lib_t,s0)
+/var/log/jabber(/.*)?		gen_context(system_u:object_r:jabberd_log_t,s0)
diff --git a/refpolicy/policy/modules/services/jabber.if b/refpolicy/policy/modules/services/jabber.if
new file mode 100644
index 000000000..ac0db06cd
--- /dev/null
+++ b/refpolicy/policy/modules/services/jabber.if
@@ -0,0 +1,21 @@
+## <summary>Jabber instant messaging server</summary>
+
+########################################
+## <summary>
+##	Connect to jabber over a TCP socket
+## </summary>
+## <param name="domain">
+##	<summary>
+##	Domain allowed access.
+##	</summary>
+## </param>
+#
+interface(`jabber_tcp_connect',`
+	gen_require(`
+		type jabberd_t;
+	')
+
+	allow $1 jabberd_t:tcp_socket { connectto recvfrom };
+	allow jabberd_t $1:tcp_socket { acceptfrom recvfrom };
+	kernel_tcp_recvfrom($1)
+')
diff --git a/refpolicy/policy/modules/services/jabber.te b/refpolicy/policy/modules/services/jabber.te
new file mode 100644
index 000000000..a07e1e625
--- /dev/null
+++ b/refpolicy/policy/modules/services/jabber.te
@@ -0,0 +1,110 @@
+
+policy_module(jabber,1.0.0)
+
+########################################
+#
+# Declarations
+#
+
+type jabberd_t;
+type jabberd_exec_t;
+init_daemon_domain(jabberd_t,jabberd_exec_t)
+
+type jabberd_log_t;
+logging_log_file(jabberd_log_t)
+
+type jabberd_var_lib_t;
+files_type(jabberd_var_lib_t)
+
+type jabberd_var_run_t;
+files_pid_file(jabberd_var_run_t)
+
+########################################
+#
+# Local policy
+#
+
+allow jabberd_t self:capability dac_override;
+dontaudit jabberd_t self:capability sys_tty_config;
+allow jabberd_t self:process signal_perms;
+allow jabberd_t self:fifo_file { read write getattr };
+allow jabberd_t self:tcp_socket create_stream_socket_perms;
+allow jabberd_t self:udp_socket create_socket_perms;
+
+allow jabberd_t jabberd_var_lib_t:file create_file_perms;
+allow jabberd_t jabberd_var_lib_t:dir rw_dir_perms;
+files_var_lib_filetrans(jabberd_t,jabberd_var_lib_t,file)
+
+allow jabberd_t jabberd_log_t:file create_file_perms;
+allow jabberd_t jabberd_log_t:dir rw_dir_perms;
+logging_log_filetrans(jabberd_t,jabberd_log_t,{ file dir })
+
+allow jabberd_t jabberd_var_run_t:file create_file_perms;
+allow jabberd_t jabberd_var_run_t:dir rw_dir_perms;
+files_pid_filetrans(jabberd_t,jabberd_var_run_t,file)
+
+kernel_read_kernel_sysctls(jabberd_t)
+kernel_list_proc(jabberd_t)
+kernel_read_proc_symlinks(jabberd_t)
+kernel_tcp_recvfrom(jabberd_t)
+
+corenet_tcp_sendrecv_generic_if(jabberd_t)
+corenet_udp_sendrecv_generic_if(jabberd_t)
+corenet_raw_sendrecv_generic_if(jabberd_t)
+corenet_tcp_sendrecv_all_nodes(jabberd_t)
+corenet_udp_sendrecv_all_nodes(jabberd_t)
+corenet_raw_sendrecv_all_nodes(jabberd_t)
+corenet_tcp_sendrecv_all_ports(jabberd_t)
+corenet_udp_sendrecv_all_ports(jabberd_t)
+corenet_non_ipsec_sendrecv(jabberd_t)
+corenet_tcp_bind_all_nodes(jabberd_t)
+corenet_udp_bind_all_nodes(jabberd_t)
+corenet_tcp_bind_jabber_client_port(jabberd_t)
+corenet_tcp_bind_jabber_interserver_port(jabberd_t)
+
+dev_read_sysfs(jabberd_t)
+# For SSL
+dev_read_rand(jabberd_t)
+
+domain_use_interactive_fds(jabberd_t)
+
+files_read_etc_files(jabberd_t)
+files_read_etc_runtime_files(jabberd_t)
+
+fs_getattr_all_fs(jabberd_t)
+fs_search_auto_mountpoints(jabberd_t)
+
+term_dontaudit_use_console(jabberd_t)
+
+init_use_fds(jabberd_t)
+init_use_script_ptys(jabberd_t)
+
+libs_use_ld_so(jabberd_t)
+libs_use_shared_libs(jabberd_t)
+
+logging_send_syslog_msg(jabberd_t)
+
+miscfiles_read_localization(jabberd_t)
+
+sysnet_read_config(jabberd_t)
+
+userdom_dontaudit_use_unpriv_user_fds(jabberd_t)
+userdom_dontaudit_search_sysadm_home_dirs(jabberd_t)
+
+ifdef(`targeted_policy',`
+	term_dontaudit_use_unallocated_ttys(jabberd_t)
+	term_dontaudit_use_generic_ptys(jabberd_t)
+	files_dontaudit_read_root_files(jabberd_t)
+')
+
+optional_policy(`
+	nis_use_ypbind(jabberd_t)
+')
+
+optional_policy(`
+	seutil_sigchld_newrole(jabberd_t)
+')
+
+optional_policy(`
+	udev_read_db(jabberd_t)
+')
diff --git a/refpolicy/policy/modules/system/userdomain.if b/refpolicy/policy/modules/system/userdomain.if
index c6b497350..5a731560e 100644
--- a/refpolicy/policy/modules/system/userdomain.if
+++ b/refpolicy/policy/modules/system/userdomain.if
@@ -378,6 +378,10 @@ template(`base_user_template',`
 		inn_read_news_spool($1_t)
 	')
 
+	optional_policy(`
+		jabber_tcp_connect($1_t)
+	')
+
 	optional_policy(`
 		nis_use_ypbind($1_t)
 	')
diff --git a/refpolicy/policy/modules/system/userdomain.te b/refpolicy/policy/modules/system/userdomain.te
index 0fc100fc3..4c95bbf50 100644
--- a/refpolicy/policy/modules/system/userdomain.te
+++ b/refpolicy/policy/modules/system/userdomain.te
@@ -1,5 +1,5 @@
 
-policy_module(userdomain,1.3.12)
+policy_module(userdomain,1.3.13)
 
 gen_require(`
 	role sysadm_r, staff_r, user_r;