diff --git a/common/sysutils.c b/common/sysutils.c
index 25de374a3..45a6d8c80 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -1105,22 +1105,24 @@ gnupg_getcwd (void)
 gpg_err_code_t
 gnupg_access (const char *name, int mode)
 {
-#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.39 */
+#if GPGRT_VERSION_NUMBER < 0x012800 /* 1.40 */
 # ifdef HAVE_W32_SYSTEM
-  wchar_t *wfname;
+  wchar_t *wname;
+  gpg_err_code_t ec;
 
-  wfname = utf8_to_wchar (fname);
-  if (!wfname)
+  wname = utf8_to_wchar (name);
+  if (!wname)
     ec = gpg_err_code_from_syserror ();
   else
     {
-      ec = _waccess (wfname, mode)? gpg_err_code_from_syserror () : 0;
-      xfree (wfname);
+      ec = _waccess (wname, mode)? gpg_err_code_from_syserror () : 0;
+      xfree (wname);
     }
+  return ec;
 # else
   return access (name, mode)? gpg_err_code_from_syserror () : 0;
 # endif
-#else
+#else /* gpgrt 1.40 or newer.  */
   return gpgrt_access (name, mode);
 #endif
 }
diff --git a/doc/HACKING b/doc/HACKING
index 0f8f84e5c..3d57ea634 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -227,7 +227,8 @@ Note that such a comment will be removed if the git commit option
   - Some-comments-by :: Name or mail address of the author of
                         additional comments (commit log or code).
   - Proofread-by :: Sometimes used by translation commits.
-  - Signed-off-by :: Name or mail address of the developer
+  - Signed-off-by :: Name or mail address of the developer.
+  - Backported-from-master :: Value is the commit id of the original patch.
 
 * Windows
 ** How to build an installer for Windows
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index dc17c27a2..232483544 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -77,6 +77,7 @@ enum {
 #define SCM_SCR331      0xe001
 #define SCM_SCR331DI    0x5111
 #define SCM_SCR335      0x5115
+#define SCM_SCR3310     0x5116    /* @MAXX Basic */
 #define SCM_SCR3320     0x5117
 #define SCM_SPR532      0xe003    /* Also used succeeding model SPR332. */
 #define CHERRY_ST2000   0x003e