         (concat "-o ControlPath='tramp.%%C' "
                 "-o ControlMaster=auto "
                 "-o ControlPersist=no"))
+
+  ;; Set the customization file path; must be done here in `user-init'.
+  ;; See: https://github.com/syl20bnr/spacemacs/commit/6212795
+  (setq custom-file "~/.spacemacs.d/custom.el")
+
+  ;; END: `dotspacemacs/user-init'
   )
 
 

                      version-control-diff-tool 'diff-hl
                      version-control-global-margin t)
     xkcd
     ;; Custom layers
     )
   ;; List of additional packages that will be installed without being

  It is called immediately after `dotspacemacs/init'.
  You are free to put almost any user code here.  The exception is
  org related code, which should be placed in `dotspacemacs/user-config'."

  ;; Helm uses Tramp which tries to figure out some SSH/DNS settings at
  ;; startup.  However, the ISP may redirect non-existing addresses to
  ;; their own servers, which causes long timeouts and blocks the startup.
