diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index 86376d9f9..3ef3c505b 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}/:"
 
 SRC_URI_append_ccardimx28js = " file://asound.inline_play.state \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
index 633676f89..add508f90 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-imx_2009.08.bbappend
@@ -2,7 +2,8 @@
 
 DESCRIPTION = "bootloader for Digi platforms"
 
-PR_append = "+${DISTRO}.r0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 
 # Uncomment to build the from sources (internal use only)
 # UBOOT_BUILD_SRC ?= "1"
diff --git a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
index b62711ba6..32b6a8abf 100644
--- a/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
+++ b/meta-digi-arm/recipes-kernel/linux-libc-headers/linux-libc-headers-imx_2.6.35.3.bbappend
@@ -1,5 +1,7 @@
 # Copyright (C) 2012 Digi International
-PR_append = "+${DISTRO}.r0"
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 
 SRCREV_mxs = "${AUTOREV}"
 KBRANCH_mxs = "refs/heads/master"
diff --git a/meta-digi-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bbappend b/meta-digi-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bbappend
index 3bdeec3e4..e07107031 100644
--- a/meta-digi-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bbappend
+++ b/meta-digi-arm/recipes-multimedia/imx-lib/imx-lib_11.09.01.bbappend
@@ -1,4 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-PR_append = "+${DISTRO}.r0"
 
 SRC_URI += " file://imx-lib-11.09.01-0003-vpu-do-not-error-if-no-VPU-IRAM-present.patch "
diff --git a/meta-digi-dbl/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bbappend b/meta-digi-dbl/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bbappend
index f8deeffae..ce01bba2d 100644
--- a/meta-digi-dbl/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bbappend
+++ b/meta-digi-dbl/recipes-connectivity/btfilter/btfilter_v3.4p1-b3.4.0.51.bbappend
@@ -1,2 +1,6 @@
-PR_append = "+${DISTRO}.r0"
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/files/:"
diff --git a/meta-digi-dbl/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bbappend b/meta-digi-dbl/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bbappend
index df2080276..dc5038367 100644
--- a/meta-digi-dbl/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bbappend
+++ b/meta-digi-dbl/recipes-kernel/kernel-module-atheros/kernel-module-atheros_git.bbappend
@@ -1,4 +1,5 @@
 # Copyright (C) 2013 by Digi International Inc.
 
-PR_append = "+${DISTRO}+r0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}/:"
diff --git a/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend b/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend
index f57bd6ec2..d63c8cf20 100644
--- a/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend
+++ b/meta-digi-del/recipes-connectivity/bluez/bluez4_4.101.bbappend
@@ -1,5 +1,9 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-PR_append = "+${DISTRO}.r0"
 
 # Use 'simple-agent' from bluez-4.98 to avoid a dependence in
 # gobject-introspection
diff --git a/meta-digi-del/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend b/meta-digi-del/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
index 6b4055fd0..4b151b259 100644
--- a/meta-digi-del/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
+++ b/meta-digi-del/recipes-connectivity/cherokee/cherokee_1.2.98.bbappend
@@ -1,5 +1,9 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-PR_append = "+${DISTRO}.r0"
 
 SRC_URI += " \
 	file://cherokee.conf \
diff --git a/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend b/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend
index 58e77de28..246a8bfc0 100644
--- a/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend
+++ b/meta-digi-del/recipes-connectivity/vsftpd/vsftpd_2.3.5.bbappend
@@ -1,6 +1,10 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/files"
 
-PR_append = "+${DISTRO}.r0"
 DEPENDS += "openssl"
 
 # Inhibit warning about files already stripped
diff --git a/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend
index 1b97946f0..7e86a1478 100644
--- a/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-digi-del/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,6 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+# Copyright (C) 2013 Digi International.
 
-PR_append = "+${DISTRO}.r0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://os-release"
 
diff --git a/meta-digi-del/recipes-core/busybox/busybox_1.20.2.bbappend b/meta-digi-del/recipes-core/busybox/busybox_1.20.2.bbappend
index 6d078768b..5a06eff87 100644
--- a/meta-digi-del/recipes-core/busybox/busybox_1.20.2.bbappend
+++ b/meta-digi-del/recipes-core/busybox/busybox_1.20.2.bbappend
@@ -1,5 +1,9 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
-PR_append = "+${DISTRO}.r0"
 
 DEPENDS += "libdigi"
 
diff --git a/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend
index 332a21f91..70acfb9eb 100644
--- a/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend
+++ b/meta-digi-del/recipes-core/initscripts/initscripts_1.0.bbappend
@@ -1,3 +1,7 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-PR_append = "+${DISTRO}.r0"
diff --git a/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend b/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend
index 69a494531..ef3912058 100644
--- a/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend
+++ b/meta-digi-del/recipes-core/netbase/netbase_5.0.bbappend
@@ -1,6 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+# Copyright (C) 2013 Digi International.
 
-PR_append = "+${DISTRO}.r0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
 DEPENDS="virtual/kernel"
 
diff --git a/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend b/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend
index 3188fd9d4..7b986bc92 100644
--- a/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend
+++ b/meta-digi-del/recipes-core/sysvinit/sysvinit_2.88dsf.bbappend
@@ -1,4 +1,7 @@
-PR_append = "+${DISTRO}.r0"
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 
 # Remove 'bootlogd' bootscript and symlinks
 # (synchronize with poky's sysvinit_2.88dsf.bb)
diff --git a/meta-digi-del/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend b/meta-digi-del/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
index 06b43ebcb..73f0cbaf6 100644
--- a/meta-digi-del/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
+++ b/meta-digi-del/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bbappend
@@ -1,3 +1,6 @@
+# Copyright (C) 2013 Digi International.
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}"
 
-PR_append = "+${DISTRO}.r0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend
index 4c67ff858..ae657849f 100644
--- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0001-ltmain.patch"
 SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch"
@@ -13,4 +18,3 @@ SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch"
 SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch"
 SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch"
 SRC_URI_append += "file://gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch"
-PR_append = "+${DISTRO}.0"
diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend
index ce555704e..3de4cef25 100644
--- a/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 # Overwrite DEPENDS to avoid livrsvg dependency
 # which brings in gtk+
 DEPENDS = "gst-plugins-base libmusicbrainz tremor curl"
diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend
index 831b697de..b7fb7ffea 100644
--- a/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11 gio', '', d)}"
 PACKAGECONFIG[x11] = ",--disable-x --disable-xshm --disable-xvideo --disable-libvisual,"
 PACKAGECONFIG[gio] = ",--disable-gio,"
diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend
index 1ea90399f..4d7dee108 100644
--- a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11 flac', '', d)}"
 PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvideo,"
 PACKAGECONFIG[flac] = ",--disable-flac,"
diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-ugly/gst-plugins-ugly_0.10.19.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-ugly/gst-plugins-ugly_0.10.19.bbappend
index 87da14948..c22d55b90 100644
--- a/meta-digi-del/recipes-multimedia/gst-plugins-ugly/gst-plugins-ugly_0.10.19.bbappend
+++ b/meta-digi-del/recipes-multimedia/gst-plugins-ugly/gst-plugins-ugly_0.10.19.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 EXTRA_OECONF += "\
 		--disable-dvdlpcmdec \
 		--disable-dvdsub \
diff --git a/meta-digi-del/recipes-multimedia/gstreamer/gstreamer_0.10.36.bbappend b/meta-digi-del/recipes-multimedia/gstreamer/gstreamer_0.10.36.bbappend
index ef2839432..2f055a6e8 100644
--- a/meta-digi-del/recipes-multimedia/gstreamer/gstreamer_0.10.36.bbappend
+++ b/meta-digi-del/recipes-multimedia/gstreamer/gstreamer_0.10.36.bbappend
@@ -1,3 +1,8 @@
+# Copyright (C) 2013 Digi International.
+
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
+
 EXTRA_OECONF += "\
 		--disable-check \
 		--disable-debug \
diff --git a/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend b/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend
index 5ca72e610..696d15936 100644
--- a/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend
+++ b/meta-digi-del/recipes-multimedia/libdvdread/libdvdread_4.1.3-10.bbappend
@@ -1,6 +1,7 @@
 # Copyright (C) 2012 Digi International.
 
-PR_append = "+${DISTRO}.0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27"
 SRC_URI = "git://sources.progress-linux.org/git/users/daniel/packages/${PN}.git;protocol=git;branch=debian"
diff --git a/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend b/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend
index 5dabf30b2..7dd660827 100644
--- a/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend
+++ b/meta-digi-del/recipes-multimedia/mplayer/mplayer2_git.bbappend
@@ -1,6 +1,7 @@
 # Copyright (C) 2012 Digi International.
 
-PR_append = "+${DISTRO}.0"
+PRINC := "${@int(PRINC) + 1}"
+PR_append = "+${DISTRO}"
 
 # live555 does not currently compile, this allows to remove it as a dependency.
 VIRTUAL-RUNTIME_streaming_framework = ""