diff --git a/api/client.go b/api/client.go
index 800d2a156e136683880de24099d77c86352c9ba0..75f70d9425e413dfd1ada004e26ca9aa7cc1b36f 100644
--- a/api/client.go
+++ b/api/client.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package api
 
 import (
diff --git a/api/client_test.go b/api/client_test.go
index cbeef676c03769fae39b58ce2bb0100813f5a75a..2ef79fc701d6fc59a1a2aa8fd092545516886d3a 100644
--- a/api/client_test.go
+++ b/api/client_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package api
 
 import "testing"
diff --git a/cmd/root.go b/cmd/root.go
index 44eba1fcd74e40e634f26a233eb6b0c80dee3ce0..89749bc27e86bc76285914c69badcb3a1a654791 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,6 +1,8 @@
-// Copyright © 2018 Privategrity Corporation
-//
-// All rights reserved.
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
 
 // Package cmd initializes the CLI and config parsers as well as the logger.
 package cmd
diff --git a/crypto/decrypt.go b/crypto/decrypt.go
index 132fb9be4f21e862be7b10fc548cf761bd32abff..f547562fc6226b0c83b9413696e780b7a029429d 100644
--- a/crypto/decrypt.go
+++ b/crypto/decrypt.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package crypto
 
 import (
diff --git a/crypto/encrypt.go b/crypto/encrypt.go
index 831254c28470c1ab7873beab84884029c2b363cf..7816299cbadd985c7b737a052056ef4fbe2dcafa 100644
--- a/crypto/encrypt.go
+++ b/crypto/encrypt.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package crypto
 
 import (
diff --git a/globals/message.go b/globals/message.go
index 217eaa4e59e6717d475e17b2b66782e41549a580..efb47da73b12a65f7a598e88ec1617f84a290d86 100644
--- a/globals/message.go
+++ b/globals/message.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 import (
diff --git a/globals/message_test.go b/globals/message_test.go
index 7d11982c921b29c0fdc40494254fd7b75162a301..70f9524f0efc21fce0f39b83c5f5e593eaedf65e 100644
--- a/globals/message_test.go
+++ b/globals/message_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 import (
diff --git a/globals/user.go b/globals/user.go
index e5a51f48829db9175ff378858596dbcf65a8b5ed..4543a33b14ae00ff4b8538ada195559ff0ef0fd9 100644
--- a/globals/user.go
+++ b/globals/user.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 // Globally instantiated UserRegistry
diff --git a/globals/userSession.go b/globals/userSession.go
index 7d449e5bd5179f7cf5d06aea7983ccc924513344..ec1dcd8aa14e710b07aefa83f0f9406250b9a82a 100644
--- a/globals/userSession.go
+++ b/globals/userSession.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 // Globally instantiated UserSession
diff --git a/globals/userSession_test.go b/globals/userSession_test.go
index 1fe08741ec813a9485a36f34aa2c559708663d8b..02ad9bda12af6a96cca8b91419617355b41f88f2 100644
--- a/globals/userSession_test.go
+++ b/globals/userSession_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 import (
diff --git a/globals/user_test.go b/globals/user_test.go
index 2eacf49a779f8c342a1bf0a1ef41183f45d13b9a..88cb44f6821bcda67155f19346b0b1a7255590ed 100644
--- a/globals/user_test.go
+++ b/globals/user_test.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package globals
 
 import (
diff --git a/io/pollingReception.go b/io/pollingReception.go
index d3858f5941a8544fba3fe206ba2e876afb88c1f8..c20923d9726eeed526434876e27547ee128fe1fd 100644
--- a/io/pollingReception.go
+++ b/io/pollingReception.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package io
 
 import (
diff --git a/io/transmitMessage.go b/io/transmitMessage.go
index 4d3fa22871e4644c786f804cc37c3434eb03c6de..3d6ae449bd808b29138cf90a5742b66a522cf2d5 100644
--- a/io/transmitMessage.go
+++ b/io/transmitMessage.go
@@ -1,3 +1,9 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
+
 package io
 
 import (
diff --git a/main.go b/main.go
index c8a942fc96816e11334b1c090dd38bfcc0c1029b..48d8c1d58a0ee5b6dbaccfe43924a6527d2f9a74 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
-// Copyright © 2018 Privategrity Corporation
-//
-// All rights reserved.
+////////////////////////////////////////////////////////////////////////////////
+// Copyright © 2018 Privategrity Corporation                                   /
+//                                                                             /
+// All rights reserved.                                                        /
+////////////////////////////////////////////////////////////////////////////////
 
 package main
 
@@ -9,4 +11,4 @@ import "gitlab.com/privategrity/client/cmd"
 // main needs no introduction.
 func main() {
 	cmd.Execute()
-}
\ No newline at end of file
+}