diff --git a/conf-lisp/tramp.el b/conf-lisp/tramp.el
index b5a2ee4..0b69165 100644
--- a/conf-lisp/tramp.el
+++ b/conf-lisp/tramp.el
@@ -5,9 +5,39 @@
 ;; Sample: C-x-f /$host:/$file ($host as of .ssh/config or direct, $file including completion)
 
 ;; doku: [[http://www.gnu.org/software/tramp/][gnu.org]]
-(setq tramp-default-method "ssh"
-      tramp-default-user nil
-      tramp-verbose 1
-      ido-enable-tramp-completion t)
+;; use tramp version, see:
+;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=39399
+
+;; (setq tramppkg (expand-file-name "el-get/tramp" tvd-config-dir))
+
+;; doesnt work:
+;; (el-get-bundle tramp
+;;   :type git
+;;   :url "https://git.savannah.gnu.org/git/tramp.git"
+;;   ;; tramp-loaddefs.el uses `tramp-verion' before it's defined,
+;;   ;; work around this by loading trampver.el first.
+;;   :autoloads ("trampver.el" "tramp-loaddefs.el")
+;;   :checkout "ELPA-2.6.0.3")
+
+;;; Tramp version fix
+;; for  now  I have  to  install  tramp  from elpa  manually,  because
+;; use-package doesn't  do it,  since it's  already loaded  on startup
+;; (because enabled by default).
+;;
+;; The el-get  version above doesn't work  as well, it leads  to mixed
+;; loading of system tramp and git tramp.
+;;
+;; FIXME: find out how to force use-package to install and use elpa tramp!
+(setq tramppkg (expand-file-name "tramp-2.6.0.3" package-user-dir))
+
+(use-package tramp
+  :load-path tramppkg
+  :ensure t
+  :config
+  (setq tramp-default-method "ssh"
+        tramp-default-user nil
+        tramp-verbose 9
+        ;;ido-enable-tramp-completion t
+        ))
 
 ;; see also backup section in system.el
diff --git a/init.el b/init.el
index 5e52c68..1ccdc94 100644
--- a/init.el
+++ b/init.el
@@ -151,7 +151,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(dictcc beacon which-key goto-last-change browse-kill-ring fringe-current-line swiper smex undo-tree fic-mode cmake-mode yaml-mode windresize web-mode use-package tablist solarized-theme smartparens rust-mode projectile persistent-scratch org-bullets markdown-mode magit iedit ibuffer-vc ibuffer-tramp hydra htmlize highlight-indentation go-mode eyebrowse elmacro dumb-jump dired-ranger dired-k dired-filter default-text-scale change-inner buffer-move))
+   '(tramp dictcc beacon which-key goto-last-change browse-kill-ring fringe-current-line swiper smex undo-tree fic-mode cmake-mode yaml-mode windresize web-mode use-package tablist solarized-theme smartparens rust-mode projectile persistent-scratch org-bullets markdown-mode magit iedit ibuffer-vc ibuffer-tramp hydra htmlize highlight-indentation go-mode eyebrowse elmacro dumb-jump dired-ranger dired-k dired-filter default-text-scale change-inner buffer-move))
  '(safe-local-variable-values '((ruby-indent-level 4))))
 
 ;; ** done