diff --git a/AUTHORS b/AUTHORS
index 1054b895e..8f1e27bb6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,9 +15,9 @@ copyrightable year that would otherwise be listed individually.
 List of Copyright holders
 =========================
 
-  Copyright (C) 1997-2016 Werner Koch
-  Copyright (C) 1994-2016 Free Software Foundation, Inc.
-  Copyright (C) 2003-2013,2015-2016 g10 Code GmbH
+  Copyright (C) 1997-2017 Werner Koch
+  Copyright (C) 1994-2017 Free Software Foundation, Inc.
+  Copyright (C) 2003-2013,2015-2017 g10 Code GmbH
   Copyright (C) 2002 Klarälvdalens Datakonsult AB
   Copyright (C) 1995-1997, 2000-2007 Ulrich Drepper <drepper@gnu.ai.mit.edu>
   Copyright (C) 1994 X Consortium
@@ -248,8 +248,8 @@ COPYING.CC0) which basically puts them into the public domain.
 
 =========
 
- Copyright 1998-2016 Free Software Foundation, Inc.
- Copyright 1997-2016 Werner Koch
+ Copyright 1998-2017 Free Software Foundation, Inc.
+ Copyright 1997-2017 Werner Koch
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/README b/README
index 18cc316d7..4cb0b6c11 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
                       =========================
                              Version 2.1
 
-          Copyright 1997-2016 Werner Koch
-          Copyright 1998-2016 Free Software Foundation, Inc.
+          Copyright 1997-2017 Werner Koch
+          Copyright 1998-2017 Free Software Foundation, Inc.
 
 
 * INTRODUCTION
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 79cb057e6..f57bac397 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1,4 +1,4 @@
-/* command-ssh.c - gpg-agent's ssh-agent emulation layer
+/* command-ssh.c - gpg-agent's implementation of the ssh-agent protocol.
  * Copyright (C) 2004-2006, 2009, 2012 Free Software Foundation, Inc.
  * Copyright (C) 2004-2006, 2009, 2012-2014 Werner Koch
  *
@@ -3216,7 +3216,7 @@ ssh_identities_remove_all (void)
   err = 0;
 
   /* FIXME: shall we remove _all_ cache entries or only those
-     registered through the ssh emulation?  */
+     registered through the ssh-agent protocol?  */
 
   return err;
 }
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index b203b07e0..c0208cc88 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -346,7 +346,7 @@ static char *redir_socket_name_extra;
 static char *socket_name_browser;
 static char *redir_socket_name_browser;
 
-/* Name of the communication socket used for ssh-agent-emulation.  */
+/* Name of the communication socket used for ssh-agent protocol.  */
 static char *socket_name_ssh;
 static char *redir_socket_name_ssh;
 
diff --git a/common/argparse.c b/common/argparse.c
index d395229ad..b53efcebf 100644
--- a/common/argparse.c
+++ b/common/argparse.c
@@ -1,6 +1,6 @@
 /* [argparse.c wk 17.06.97] Argument Parser for option handling
  * Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
- * Copyright (C) 1997-2001, 2006-2008, 2013-2016 Werner Koch
+ * Copyright (C) 1997-2001, 2006-2008, 2013-2017 Werner Koch
  *
  * This file is part of GnuPG.
  *
@@ -71,7 +71,7 @@
 #else /* Used by GnuPG  */
 
 # define ARGPARSE_GPL_VERSION      3
-# define ARGPARSE_CRIGHT_STR "Copyright (C) 2016 Free Software Foundation, Inc."
+# define ARGPARSE_CRIGHT_STR "Copyright (C) 2017 Free Software Foundation, Inc."
 
 #endif /*GNUPG_MAJOR_VERSION*/
 
diff --git a/common/w32info-rc.h.in b/common/w32info-rc.h.in
index d7909dde5..4e46b978a 100644
--- a/common/w32info-rc.h.in
+++ b/common/w32info-rc.h.in
@@ -29,4 +29,4 @@ built on @BUILD_HOSTNAME@ at @BUILD_TIMESTAMP@\0"
 #define W32INFO_PRODUCTVERSION "@VERSION@\0"
 
 #define W32INFO_LEGALCOPYRIGHT "Copyright \xa9 \
-2015 Free Software Foundation, Inc.\0"
+2017 Free Software Foundation, Inc.\0"
diff --git a/g10/pubring.asc b/g10/pubring.asc
index 09b099bfe..5b4e9f14b 100644
--- a/g10/pubring.asc
+++ b/g10/pubring.asc
@@ -1,6 +1,6 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1.0.0e (GNU/Linux)
-Comment: For info see http://www.gnupg.org
+Comment: For info see https://www.gnupg.org
 
 mQGiBDVBlNMRBADeX96LvyNiop30YPeeCBJZzeqQuQ3yQ+SK3AHoXLQ1qsGHrdoi
 HfHbVV2GfulRq+H/z97vUtA3APE2NZ7HuvBJzhXZCOE93wT59OZV8Pp5ir6TAEYm
diff --git a/g10/sqrtu32.c b/g10/sqrtu32.c
index 11513b093..1490b3162 100644
--- a/g10/sqrtu32.c
+++ b/g10/sqrtu32.c
@@ -7,7 +7,7 @@
  * to this file.
  *
  * You should have received a copy of the CC0 legalcode along with this
- * work.  If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * work.  If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
 /* The R code to generate the following table.  */
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index 44ff43c45..f8b6fdc60 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -253,9 +253,9 @@ static void
 print_version (int with_help)
 {
   fputs (MYVERSION_LINE "\n"
-         "Copyright (C) 2010 Free Software Foundation, Inc.\n"
+         "Copyright (C) 2017 Free Software Foundation, Inc.\n"
          "License GPLv3+: "
-         "GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
+         "GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
          "This is free software: you are free to change and redistribute it.\n"
          "There is NO WARRANTY, to the extent permitted by law.\n",
          stdout);