diff --git a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
index ed28cea..a335993 100644
--- a/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
+++ b/recipes-osmocom/libosmo-sccp/libosmo-sccp_git.bb
@@ -4,7 +4,7 @@
 SRCREV = "54fa75b85c91bb4bb79960942f63968f6423f6a5"
 SRC_URI = "git://git.osmocom.org/libosmo-sccp.git;protocol=git"
 PV = "0.7.0+gitr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 # we require the tests to link to the static libosmo-sigtran library to
 # access symbols not starting with osmo_*
@@ -31,3 +31,4 @@
 		${bindir}/osmo-stp \
 		${sysconfdir}/osmocom/osmo-stp.cfg \
 		"
+CONFFILES_osmo-stp = "${sysconfdir}/osmocom/osmo-stp.cfg"
diff --git a/recipes-osmocom/osmo-bsc/osmo-bsc.inc b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
index dfa332a..820baf5 100644
--- a/recipes-osmocom/osmo-bsc/osmo-bsc.inc
+++ b/recipes-osmocom/osmo-bsc/osmo-bsc.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "sqlite3 libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw"
 
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -23,6 +23,8 @@
 SYSTEMD_PACKAGES = "osmo-bsc"
 SYSTEMD_SERVICE_osmo-bsc = "osmo-bsc.service"
 
+CONFFILES_osmo-bsc = "${sysconfdir}/osmocom/osmo-bsc.cfg"
+
 FILES_ipaccess-utils = " \
 		${bindir}/ipaccess-find \
 		${bindir}/ipaccess-config \
@@ -33,5 +35,6 @@
 		${bindir}/osmo-bsc_nat \
 		${sysconfdir}/osmocom/osmo-bsc_nat.cfg \
 		"
+CONFFILES_osmo-bsc-nat = "${sysconfdir}/osmocom/osmo-bsc_nat.cfg"
 
 FILES_osmo-bsc-nat-doc = " ${docdir}/osmo-bsc/examples/osmo-bsc_nat "
diff --git a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
index 2751985..3aafe13 100644
--- a/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
+++ b/recipes-osmocom/osmo-ggsn/osmo-ggsn_git.bb
@@ -3,7 +3,7 @@
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
 PV = "1.0.0+gitr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRCREV = "859f9b0752419d43928d465bc96a87238c6d7940"
 SRC_URI = "git://git.osmocom.org/osmo-ggsn                   \
@@ -35,6 +35,8 @@
 INITSCRIPT_NAME_osmo-ggsn = "osmo-ggsn"
 INITSCRIPT_PARAMS_osmo-ggsn = "defaults 29 29"
 
+CONFFILES_osmo-ggsn = "${sysconfdir}/osmocom/osmo-ggsn.cfg"
+
 FILES_libgtp = "${libdir}/*${SOLIBS}"
 FILES_libgtp-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la"
 FILES_libgtp-staticdev = "${libdir}/*.a"
diff --git a/recipes-osmocom/osmo-hlr/osmo-hlr.inc b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
index 8afe774..7dd6234 100644
--- a/recipes-osmocom/osmo-hlr/osmo-hlr.inc
+++ b/recipes-osmocom/osmo-hlr/osmo-hlr.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libtalloc libosmocore libosmo-abis sqlite3 sqlite3-native"
 
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -24,3 +24,7 @@
 }
 
 SYSTEMD_SERVICE_${PN} = "${PN}.service"
+CONFFILES_osmo-hlr = "\
+		${sysconfdir}/osmocom/osmo-hlr.cfg \
+		${localstatedir}/lib/osmocom/hlr.db \
+		"
diff --git a/recipes-osmocom/osmo-iuh/osmo-iuh.inc b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
index a5f1cbc..2737412 100644
--- a/recipes-osmocom/osmo-iuh/osmo-iuh.inc
+++ b/recipes-osmocom/osmo-iuh/osmo-iuh.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libosmocore libosmo-netif libosmo-sccp libasn1c"
 
-INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -35,5 +35,6 @@
 		${bindir}/osmo-hnbgw \
 		${sysconfdir}/osmocom/osmo-hnbgw.cfg \
 		"
+CONFFILES_osmo-hnbgw = "${sysconfdir}/osmocom/osmo-hnbgw.cfg"
 
 ALLOW_EMPTY_${PN} = "1"
diff --git a/recipes-osmocom/osmo-mgw/osmo-mgw.inc b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
index 45ee338..1b3362f 100644
--- a/recipes-osmocom/osmo-mgw/osmo-mgw.inc
+++ b/recipes-osmocom/osmo-mgw/osmo-mgw.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libosmocore libosmo-netif bcg729 libgsm"
 
-INC_PR="r0.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r1.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -20,3 +20,4 @@
 }
 
 SYSTEMD_SERVICE_osmo-mgw = "osmo-bsc-mgcp.service"
+CONFFILES_osmo-mgw = "${sysconfdir}/osmocom/osmo-bsc-mgcp.cfg"
diff --git a/recipes-osmocom/osmo-msc/osmo-msc.inc b/recipes-osmocom/osmo-msc/osmo-msc.inc
index 9be747d..82a51b1 100644
--- a/recipes-osmocom/osmo-msc/osmo-msc.inc
+++ b/recipes-osmocom/osmo-msc/osmo-msc.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "libdbi libosmocore libosmo-abis libosmo-sccp libosmo-netif osmo-mgw"
 
-INC_PR="r2.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -28,3 +28,4 @@
 }
 
 SYSTEMD_SERVICE_${PN} = "${PN}.service"
+CONFFILES_osmo-msc = "${sysconfdir}/osmocom/osmo-msc.cfg"
diff --git a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
index 74a6bd4..8ed6a10 100644
--- a/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
+++ b/recipes-osmocom/osmo-sgsn/osmo-sgsn.inc
@@ -5,7 +5,7 @@
 
 DEPENDS = "c-ares libpcap libosmocore libosmo-netif libosmo-sccp osmo-ggsn"
 
-INC_PR="r3.${META_TELEPHONY_OSMO_INC}"
+INC_PR="r4.${META_TELEPHONY_OSMO_INC}"
 
 inherit autotools pkgconfig systemd
 
@@ -29,15 +29,19 @@
 SYSTEMD_SERVICE_osmo-sgsn = "osmo-sgsn.service"
 SYSTEMD_SERVICE_osmo-gbproxy = "osmo-gbproxy.service"
 
+CONFFILES_osmo-sgsn = "${sysconfdir}/osmocom/osmo-sgsn.cfg"
+
 FILES_osmo-gbproxy = " \
 		${bindir}/osmo-gbproxy \
 		${sysconfdir}/osmocom/osmo-gbproxy.cfg \
 		"
+CONFFILES_osmo-gbproxy = "${sysconfdir}/osmocom/osmo-gbproxy.cfg"
 
 FILES_osmo-gtphub = " \
 		${bindir}/osmo-gtphub \
 		${sysconfdir}/osmocom/osmo-gtphub.cfg \
 		"
+CONFFILES_osmo-gtphub = "${sysconfdir}/osmocom/osmo-gtphub.cfg"
 
 FILES_osmo-gbproxy-doc = " ${docdir}/osmo-sgsn/examples/osmo-gbproxy "
 FILES_osmo-gtphub-doc = " ${docdir}/osmo-sgsn/examples/osmo-gtphub "