diff --git a/config.org b/config.org
index c3f6a27..fa8e98d 100644
--- a/config.org
+++ b/config.org
@@ -470,6 +470,8 @@ To be fair, I didn't test this in a while...
 
 * Helm
 
+** General config
+
 #+BEGIN_SRC emacs-lisp
 (use-package helm
   :ensure t
@@ -534,6 +536,27 @@ To be fair, I didn't test this in a while...
 
 #+END_SRC
 
+** Helm-gtags
+
+#+BEGIN_SRC emacs-lisp
+(use-package helm-gtags
+  :ensure t
+  :bind
+    ( "M-." . 'helm-gtags-find-tag-from-here)
+    ( "M-," . 'helm-gtags-pop-stack)
+    ( "C-c f" . 'helm-gtags-find-files)
+    ( "C-c p" . 'helm-gtags-parse-file)
+  :config
+    (add-hook 'c-mode-hook 'helm-gtags-mode)
+    (add-hook 'c++-mode-hook 'helm-gtags-mode)
+    (add-hook 'python-mode-hook 'helm-gtags-mode)
+    (add-hook 'java-mode-hook 'helm-gtags-mode)
+    (add-hook 'asm-mode-hook 'helm-gtags-mode)
+
+    (custom-set-variables '(helm-gtags-auto-update t))
+)
+#+END_SRC
+
 * Old stuff, maybe usefull for lookup later
 
 ** Diff mode stuff
diff --git a/custom/setup-helm-gtags.el b/custom/setup-helm-gtags.el
deleted file mode 100644
index 09b7e09..0000000
--- a/custom/setup-helm-gtags.el
+++ /dev/null
@@ -1,19 +0,0 @@
-(require 'helm-gtags)
-
-;; Enable helm-gtags-mode in languages that GNU Global supports
-(add-hook 'c-mode-hook 'helm-gtags-mode)
-(add-hook 'c++-mode-hook 'helm-gtags-mode)
-(add-hook 'python-mode-hook 'helm-gtags-mode)
-(add-hook 'java-mode-hook 'helm-gtags-mode)
-(add-hook 'asm-mode-hook 'helm-gtags-mode)
-
-;; customize behaviour
-(custom-set-variables
- '(helm-gtags-auto-update t))
-
-(global-set-key (kbd "M-.") 'helm-gtags-find-tag-from-here)
-(global-set-key (kbd "M-,") 'helm-gtags-pop-stack)
-(global-set-key (kbd "C-c C-f") 'helm-gtags-find-files)
-(global-set-key (kbd "C-c g f") 'helm-gtags-parse-file)
-
-(provide 'setup-helm-gtags)