diff --git a/contrib/etc/default/ebusd.debian b/contrib/debian/default/ebusd
similarity index 100%
rename from contrib/etc/default/ebusd.debian
rename to contrib/debian/default/ebusd
diff --git a/contrib/etc/init.d/ebusd.debian b/contrib/debian/init.d/ebusd
similarity index 100%
rename from contrib/etc/init.d/ebusd.debian
rename to contrib/debian/init.d/ebusd
diff --git a/contrib/etc/conf.d/ebusd.gentoo b/contrib/gentoo/conf.d/ebusd
similarity index 100%
rename from contrib/etc/conf.d/ebusd.gentoo
rename to contrib/gentoo/conf.d/ebusd
diff --git a/contrib/etc/init.d/ebusd.gentoo b/contrib/gentoo/init.d/ebusd
similarity index 100%
rename from contrib/etc/init.d/ebusd.gentoo
rename to contrib/gentoo/init.d/ebusd
diff --git a/make_debian.sh b/make_debian.sh
index d895f1b1..c1b4b8db 100755
--- a/make_debian.sh
+++ b/make_debian.sh
@@ -44,8 +44,8 @@ echo "*************"
 echo
 mkdir -p $RELEASE/DEBIAN $RELEASE/etc/init.d $RELEASE/etc/default $RELEASE/etc/ebusd $RELEASE/etc/logrotate.d || exit 1
 rm $RELEASE/usr/bin/ebusfeed
-cp contrib/etc/init.d/ebusd.debian $RELEASE/etc/init.d/ebusd || exit 1
-cp contrib/etc/default/ebusd.debian $RELEASE/etc/default/ebusd || exit 1
+cp contrib/debian/init.d/ebusd $RELEASE/etc/init.d/ebusd || exit 1
+cp contrib/debian/default/ebusd $RELEASE/etc/default/ebusd || exit 1
 cp contrib/etc/ebusd/* $RELEASE/etc/ebusd/ || exit 1
 cp contrib/etc/logrotate.d/ebusd $RELEASE/etc/logrotate.d/ || exit 1
 cp ChangeLog.md $RELEASE/DEBIAN/changelog || exit 1