diff --git a/.etckeeper b/.etckeeper
index 6dbad40..0446906 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -32,7 +32,6 @@ mkdir -p './firewalld/icmptypes'
 mkdir -p './firewalld/ipsets'
 mkdir -p './firewalld/policies'
 mkdir -p './firewalld/services'
-mkdir -p './gdbinit.d'
 mkdir -p './glances'
 mkdir -p './glvnd/egl_vendor.d'
 mkdir -p './gnupg'
@@ -911,6 +910,7 @@ maybe chmod 0755 'gcrypt'
 maybe chmod 0644 'gcrypt/random.conf'
 maybe chmod 0644 'gdbinit'
 maybe chmod 0755 'gdbinit.d'
+maybe chmod 0644 'gdbinit.d/golang.gdb'
 maybe chmod 0755 'glances'
 maybe chmod 0755 'glvnd'
 maybe chmod 0755 'glvnd/egl_vendor.d'
@@ -5049,6 +5049,8 @@ maybe chmod 0600 'ppp/pap-secrets'
 maybe chmod 0755 'ppp/peers'
 maybe chmod 0644 'ppp/peers/vpn_gazduire.ro'
 maybe chmod 0644 'pptpd.conf'
+maybe chmod 0755 'prelink.conf.d'
+maybe chmod 0644 'prelink.conf.d/golang.conf'
 maybe chmod 0644 'printcap'
 maybe chmod 0755 'privoxy'
 maybe chmod 0644 'privoxy/config'
diff --git a/gdbinit.d/golang.gdb b/gdbinit.d/golang.gdb
new file mode 100644
index 0000000..4ef690b
--- /dev/null
+++ b/gdbinit.d/golang.gdb
@@ -0,0 +1 @@
+add-auto-load-safe-path /usr/lib/golang/src/pkg/runtime/runtime-gdb.py
diff --git a/prelink.conf.d/golang.conf b/prelink.conf.d/golang.conf
new file mode 100644
index 0000000..471e8e6
--- /dev/null
+++ b/prelink.conf.d/golang.conf
@@ -0,0 +1,3 @@
+# there are ELF files in src which are testdata and shouldn't be modified
+-b /usr/lib/golang/src
+-b /usr/lib64/golang/src