diff --git a/README.md b/README.md
index 106bf05..2ba8ecd 100644
--- a/README.md
+++ b/README.md
@@ -78,4 +78,4 @@ There currently does not exist a Python 3-compatible Debian package for [Hamlib]
 Contact
 -------
 
-If you have any comments or questions about PyQSO, please send them via email to Christian Jacobs (M0UOS) at <christian@christianjacobs.uk>.
+If you have any comments or questions about PyQSO please send them via email to Christian Jacobs, M0UOS, at <christian@christianjacobs.uk>.
diff --git a/docs/source/conf.py b/docs/source/conf.py
index fa7909b..08d9da7 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -51,7 +51,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'PyQSO'
-copyright = u'2015-2017, Christian Thomas Jacobs (M0UOS)'
+copyright = u'2015-2017, Christian Thomas Jacobs'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -204,7 +204,7 @@ latex_elements = {
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
     ('index', 'PyQSO.tex', u'PyQSO Documentation',
-     u'Christian Thomas Jacobs (M0UOS)', 'manual'),
+     u'Christian Thomas Jacobs, M0UOS', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -234,7 +234,7 @@ latex_documents = [
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'pyqso', u'PyQSO Documentation',
-     [u'Christian Thomas Jacobs (M0UOS)'], 1)
+     [u'Christian Thomas Jacobs, M0UOS'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -248,7 +248,7 @@ man_pages = [
 #  dir menu entry, description, category)
 texinfo_documents = [
     ('index', 'PyQSO', u'PyQSO Documentation',
-     u'Christian Thomas Jacobs (M0UOS)', 'PyQSO', 'A contact logging tool for amateur radio operators.',
+     u'Christian Thomas Jacobs, M0UOS', 'PyQSO', 'A contact logging tool for amateur radio operators.',
      'Miscellaneous'),
 ]
 
diff --git a/docs/source/introduction.rst b/docs/source/introduction.rst
index f738cbd..f190842 100644
--- a/docs/source/introduction.rst
+++ b/docs/source/introduction.rst
@@ -62,7 +62,7 @@ PyQSO is free software, released under the `GNU General Public License <http://w
 Contact
 -------
 
-If you have any comments or questions about PyQSO, please send them via email to Christian Jacobs (M0UOS) at christian@christianjacobs.uk. Bug reports and feature requests can be made via the `issue tracker <https://github.com/ctjacobs/pyqso/issues>`_.
+If you have any comments or questions about PyQSO, please send them via email to Christian Jacobs, M0UOS, at christian@christianjacobs.uk. Bug reports and feature requests can be made via the `issue tracker <https://github.com/ctjacobs/pyqso/issues>`_.
 
 Structure of this documentation
 -------------------------------
diff --git a/pyqso/glade/pyqso.glade b/pyqso/glade/pyqso.glade
index 20b63ee..4e8d900 100644
--- a/pyqso/glade/pyqso.glade
+++ b/pyqso/glade/pyqso.glade
@@ -874,7 +874,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.</property>
-    <property name="authors">Christian Thomas Jacobs (M0UOS)</property>
+    <property name="authors">Christian Thomas Jacobs, M0UOS</property>
     <property name="logo_icon_name"/>
     <property name="license_type">custom</property>
     <child internal-child="vbox">