diff --git a/docs/source/advanced/security/index.rst b/docs/source/advanced/security/index.rst
index dfa8440d9..5fdc56f08 100644
--- a/docs/source/advanced/security/index.rst
+++ b/docs/source/advanced/security/index.rst
@@ -1,8 +1,9 @@
 Security
 ========
 
-TODO, organize/rewrite from http://sourceforge.net/p/xcat/wiki/XCAT_2_Security/
+The security of a system covers a wide range of elements, from the security of system deployment and configuration, to the security of the system management, and the security of the software that is running on the system. This document will only discuss security features that are currently implemented in xCAT, not address the OS or any additional software packages that might be installed.
 
 .. toctree::
    :maxdepth: 2
 
+   security
diff --git a/docs/source/advanced/security/security.rst b/docs/source/advanced/security/security.rst
index a06fe3f3e..628bf6d16 100644
--- a/docs/source/advanced/security/security.rst
+++ b/docs/source/advanced/security/security.rst
@@ -1,9 +1,3 @@
-xCAT Security
-=============
-
-The security of a system covers a wide range of elements, from the security of system deployment and configuration, to the security of the system management, and the security of the software that is running on the system. This document will only discuss security features that are currently implemented in xCAT, not address the OS or any additional software packages that might be installed. 
-
-
 Transmission Channel
 --------------------