diff --git a/pkg/security/podsecuritypolicy/capabilities/doc.go b/pkg/security/podsecuritypolicy/capabilities/doc.go
new file mode 100644
index 00000000000..ff0383a270d
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/capabilities/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package capabilities contains code for validating and defaulting a pod's
+// kernel capabilities according to a security policy.
+package capabilities
diff --git a/pkg/security/podsecuritypolicy/doc.go b/pkg/security/podsecuritypolicy/doc.go
new file mode 100644
index 00000000000..3a8052c5363
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/doc.go
@@ -0,0 +1,20 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package podsecuritypolicy contains code for validating and defaulting the
+// security context of a pod and its containers according to a security
+// policy.
+package podsecuritypolicy
diff --git a/pkg/security/podsecuritypolicy/group/doc.go b/pkg/security/podsecuritypolicy/group/doc.go
new file mode 100644
index 00000000000..9bb177b442a
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/group/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package group contains code for validating and defaulting the FSGroup and
+// supplemental groups of a pod according to a security policy.
+package group
diff --git a/pkg/security/podsecuritypolicy/selinux/doc.go b/pkg/security/podsecuritypolicy/selinux/doc.go
new file mode 100644
index 00000000000..506981a9f40
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/selinux/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package selinux contains code for validating and defaulting the SELinux
+// context of a pod according to a security policy.
+package selinux
diff --git a/pkg/security/podsecuritypolicy/user/doc.go b/pkg/security/podsecuritypolicy/user/doc.go
new file mode 100644
index 00000000000..1ddc08aee6d
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/user/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package user contains code for validating and defaulting the UID of a pod
+// or container according to a security policy.
+package user
diff --git a/pkg/security/podsecuritypolicy/util/doc.go b/pkg/security/podsecuritypolicy/util/doc.go
new file mode 100644
index 00000000000..af407b58c66
--- /dev/null
+++ b/pkg/security/podsecuritypolicy/util/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2016 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package util contains utility code shared amongst different parts of the
+// pod security policy apparatus.
+package util