diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index dc13d11c..1906720f 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -62,13 +62,12 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildro
 install -d -m 755 %{buildroot}%{_datadir}/i2pd
 install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
-%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
+%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
 install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
 install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
 install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
-ln -s %{_sysconfdir}/i2pd/tunnels.conf.d %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
-
+ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
 
 
 %pre
@@ -94,8 +93,8 @@ getent passwd i2pd >/dev/null || \
 %doc LICENSE README.md
 %{_sbindir}/i2pd
 %{_datadir}/i2pd/certificates
-%{_datadir}/i2pd/tunnels.conf.d
 %config(noreplace) %{_sysconfdir}/i2pd/*
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*
 /%{_unitdir}/i2pd.service
 %dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
 %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index 5eb53cd9..20fedff7 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -60,12 +60,12 @@ install -D -m 755 %{_builddir}/%{name}-%{version}/contrib/tunnels.conf %{buildro
 install -d -m 755 %{buildroot}%{_datadir}/i2pd
 install -d -m 755 %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
 %{__cp} -r %{_builddir}/%{name}-%{version}/contrib/certificates/ %{buildroot}%{_datadir}/i2pd/certificates
-%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
+%{__cp} -r %{_builddir}/%{name}-%{version}/contrib/tunnels.d/ %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
 install -D -m 644 %{_builddir}/%{name}-%{version}/contrib/rpm/i2pd.service %{buildroot}%{_unitdir}/i2pd.service
 install -d -m 700 %{buildroot}%{_sharedstatedir}/i2pd
 install -d -m 700 %{buildroot}%{_localstatedir}/log/i2pd
 ln -s %{_datadir}/%{name}/certificates %{buildroot}%{_sharedstatedir}/i2pd/certificates
-ln -s %{_sysconfdir}/i2pd/tunnels.conf.d %{buildroot}%{_datadir}/i2pd/tunnels.conf.d
+ln -s %{_datadir}/i2pd/tunnels.conf.d %{buildroot}%{_sysconfdir}/i2pd/tunnels.conf.d
 
 
 %pre
@@ -91,8 +91,8 @@ getent passwd i2pd >/dev/null || \
 %doc LICENSE README.md
 %{_sbindir}/i2pd
 %{_datadir}/i2pd/certificates
-%{_datadir}/i2pd/tunnels.conf.d
 %config(noreplace) %{_sysconfdir}/i2pd/*
+%config(noreplace) %{_sysconfdir}/i2pd/tunnels.conf.d/*
 /%{_unitdir}/i2pd.service
 %dir %attr(0700,i2pd,i2pd) %{_localstatedir}/log/i2pd
 %dir %attr(0700,i2pd,i2pd) %{_sharedstatedir}/i2pd
diff --git a/debian/i2pd.dirs b/debian/i2pd.dirs
index 7b0567bd..736e23bd 100644
--- a/debian/i2pd.dirs
+++ b/debian/i2pd.dirs
@@ -1,3 +1,3 @@
 etc/i2pd
+etc/i2pd/tunnels.conf.d
 var/lib/i2pd
-var/lib/i2pd/tunnels.conf.d
diff --git a/debian/i2pd.install b/debian/i2pd.install
index 2684cbbf..cae69c0e 100644
--- a/debian/i2pd.install
+++ b/debian/i2pd.install
@@ -3,5 +3,5 @@ contrib/i2pd.conf      etc/i2pd/
 contrib/tunnels.conf etc/i2pd/
 contrib/subscriptions.txt etc/i2pd/
 contrib/certificates/ usr/share/i2pd/
-contrib/tunnels.d/ var/lib/i2pd/tunnels.conf.d
+contrib/tunnels.d/ etc/i2pd/tunnels.conf.d
 contrib/apparmor/usr.sbin.i2pd etc/apparmor.d