diff --git a/recipes/aalib/aalib_1.4rc5.bb b/recipes/aalib/aalib_1.4rc5.bb
index a9586083e4..a44c5503b1 100644
--- a/recipes/aalib/aalib_1.4rc5.bb
+++ b/recipes/aalib/aalib_1.4rc5.bb
@@ -2,7 +2,7 @@ DEPENDS = "ncurses"
 DESCRIPTION = "An ASCII art gfx library."
 SECTION = "libs"
 LICENSE="LGPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/aa-project/aalib-${PV}.tar.gz \
 	   file://configure.patch"
diff --git a/recipes/alsa/alsa-scenario_0.2.bb b/recipes/alsa/alsa-scenario_0.2.bb
index 72afc8db7a..f08de93ab2 100644
--- a/recipes/alsa/alsa-scenario_0.2.bb
+++ b/recipes/alsa/alsa-scenario_0.2.bb
@@ -4,7 +4,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 SRC_URI = "http://sources.slimlogic.co.uk/libscenario/scenario-lib-0.2.0.tar.bz2"
diff --git a/recipes/alsa/alsa-scenario_git.bb b/recipes/alsa/alsa-scenario_git.bb
index ffe2d10044..277f296bd0 100644
--- a/recipes/alsa/alsa-scenario_git.bb
+++ b/recipes/alsa/alsa-scenario_git.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
 SRCREV = "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 PV = "0.2+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/alsa/alsa-utils_1.0.17.bb b/recipes/alsa/alsa-utils_1.0.17.bb
index 174dfd4415..f8487c4253 100644
--- a/recipes/alsa/alsa-utils_1.0.17.bb
+++ b/recipes/alsa/alsa-utils_1.0.17.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://alsa-utils-automake.patch \
diff --git a/recipes/alsa/alsa-utils_1.0.18.bb b/recipes/alsa/alsa-utils_1.0.18.bb
index f53de1397e..cff13ea6ed 100644
--- a/recipes/alsa/alsa-utils_1.0.18.bb
+++ b/recipes/alsa/alsa-utils_1.0.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
            file://alsa-utils-automake.patch \
diff --git a/recipes/alsa/alsa-utils_1.0.19.bb b/recipes/alsa/alsa-utils_1.0.19.bb
index f4b92bbffb..597a605c03 100644
--- a/recipes/alsa/alsa-utils_1.0.19.bb
+++ b/recipes/alsa/alsa-utils_1.0.19.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
 	   file://alsa-utils-remove-xmlto-1.0.19plus.patch \
 	  "
-	
 
 inherit autotools
 
diff --git a/recipes/alsa/alsa-utils_1.0.20.bb b/recipes/alsa/alsa-utils_1.0.20.bb
index 462d919b31..cca29804c0 100644
--- a/recipes/alsa/alsa-utils_1.0.20.bb
+++ b/recipes/alsa/alsa-utils_1.0.20.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
 	   file://alsa-utils-remove-xmlto-1.0.19plus.patch \
 	  "
-	
 
 inherit gettext autotools
 
diff --git a/recipes/asterisk/asterisk_1.2.24.bb b/recipes/asterisk/asterisk_1.2.24.bb
index 5610e58ab7..fb2fd4b832 100644
--- a/recipes/asterisk/asterisk_1.2.24.bb
+++ b/recipes/asterisk/asterisk_1.2.24.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-PR = "r1"
+PR = "r2"
 
 SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch \
diff --git a/recipes/asterisk/asterisk_1.2.28.bb b/recipes/asterisk/asterisk_1.2.28.bb
index 89e6a95acf..e49e68d7c7 100644
--- a/recipes/asterisk/asterisk_1.2.28.bb
+++ b/recipes/asterisk/asterisk_1.2.28.bb
@@ -5,7 +5,7 @@ HOMEPAGE="www.asterisk.org"
 LICENSE="GPL"
 DEPENDS="ncurses zlib openssl curl alsa-lib libogg libvorbis speex"
 SECTION = "console/telephony"
-PR = "r1"
+PR = "r2"
 
 SRC_URI="http://ftp.digium.com/pub/asterisk/releases/asterisk-${PV}.tar.gz \
 	 file://uclibc-compat-getloadavg.patch \
diff --git a/recipes/aumix/aumix_2.8.bb b/recipes/aumix/aumix_2.8.bb
index 3599d0d4d5..a4f0af72f3 100644
--- a/recipes/aumix/aumix_2.8.bb
+++ b/recipes/aumix/aumix_2.8.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "A mixer for the terminal or X11, with mouse support."
 SECTION = "console/multimedia"
 LICENSE = "GPLV2"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "http://jpj.net/~trevor/aumix/aumix-${PV}.tar.bz2 \
 	   file://configure.patch"
diff --git a/recipes/avrdude/avrdude_5.10.bb b/recipes/avrdude/avrdude_5.10.bb
index 95899d97a0..e033a11001 100644
--- a/recipes/avrdude/avrdude_5.10.bb
+++ b/recipes/avrdude/avrdude_5.10.bb
@@ -1,4 +1,5 @@
 require avrdude.inc
+PR = "r1"
 
 SRC_URI[md5sum] = "69b082683047e054348088fd63bad2ff"
 SRC_URI[sha256sum] = "81501b63d5b8699874d00c9eca42837b85695bc0820ba9843b17f573ce38be5e"
diff --git a/recipes/bash/bash_3.0.bb b/recipes/bash/bash_3.0.bb
index bdbbb83a5d..60e6707f2b 100644
--- a/recipes/bash/bash_3.0.bb
+++ b/recipes/bash/bash_3.0.bb
@@ -1,5 +1,5 @@
 require bash.inc
-PR = "r12"
+PR = "r13"
 
 SRC_URI += "\
   file://bash-3.0-fixes.patch \
diff --git a/recipes/bash/bash_3.2.bb b/recipes/bash/bash_3.2.bb
index 5cf854b4e4..4b8201f6c2 100644
--- a/recipes/bash/bash_3.2.bb
+++ b/recipes/bash/bash_3.2.bb
@@ -1,6 +1,6 @@
 require bash.inc
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI += "\
            file://builtins.patch \
diff --git a/recipes/blassic/blassic_0.10.1.bb b/recipes/blassic/blassic_0.10.1.bb
index 1a2b4ea2db..c1882d38bb 100644
--- a/recipes/blassic/blassic_0.10.1.bb
+++ b/recipes/blassic/blassic_0.10.1.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "classic basic interpreter"
 LICENSE = "GPLv2"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "http://www.blassic.org/bin/blassic-${PV}.tgz"
 
diff --git a/recipes/btscanner/btscanner_1.0.bb b/recipes/btscanner/btscanner_1.0.bb
index a475b959a5..d48d05a765 100644
--- a/recipes/btscanner/btscanner_1.0.bb
+++ b/recipes/btscanner/btscanner_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses"
-PR = "r3"
+PR = "r4"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.gz \
diff --git a/recipes/btscanner/btscanner_2.0.bb b/recipes/btscanner/btscanner_2.0.bb
index ce101c9228..ec5bf66d00 100644
--- a/recipes/btscanner/btscanner_2.0.bb
+++ b/recipes/btscanner/btscanner_2.0.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads&section=01_bluetooth"
 DEPENDS = "bluez-libs gdbm ncurses libxml2"
-PR = "r2"
+PR = "r3"
 LICENSE = "GPLv2"
 
 SRC_URI = "http://www.pentest.co.uk/src/btscanner-${PV}.tar.bz2 \
diff --git a/recipes/bvi/bvi_1.3.1.bb b/recipes/bvi/bvi_1.3.1.bb
index 120ef8d392..d906e4258c 100644
--- a/recipes/bvi/bvi_1.3.1.bb
+++ b/recipes/bvi/bvi_1.3.1.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "binary vi (binary file editor)"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bvi/bvi-${PV}.src.tar.gz \
 	   file://configure.patch \
diff --git a/recipes/bwm-ng/bwm-ng_0.6.bb b/recipes/bwm-ng/bwm-ng_0.6.bb
index 7fbeed5208..3f43d13dc6 100644
--- a/recipes/bwm-ng/bwm-ng_0.6.bb
+++ b/recipes/bwm-ng/bwm-ng_0.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Lightweight console network and disk bandwidth monitor"
 LICENSE = "GPLv2"
 DEPENDS = "ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmng/bwm-ng-${PV}.tar.gz"
 
diff --git a/recipes/bwmon/bwmon_1.3.bb b/recipes/bwmon/bwmon_1.3.bb
index 1e509a17fb..abdae41ac8 100644
--- a/recipes/bwmon/bwmon_1.3.bb
+++ b/recipes/bwmon/bwmon_1.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The Linux bandwidth monitor"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bwmon/${P}.tar.gz \
            file://makefile.patch"
diff --git a/recipes/bzflag/bzflag-server_1.10.6.20040515.bb b/recipes/bzflag/bzflag-server_1.10.6.20040515.bb
index fb62d7979d..1885b94aef 100644
--- a/recipes/bzflag/bzflag-server_1.10.6.20040515.bb
+++ b/recipes/bzflag/bzflag-server_1.10.6.20040515.bb
@@ -1,6 +1,7 @@
 SECTION = "console/network"
 DEPENDS = "adns ncurses"
 LICENSE = "LGPL"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2"
 S = "${WORKDIR}/bzflag-${PV}"
diff --git a/recipes/bzflag/bzflag_1.10.6.20040515.bb b/recipes/bzflag/bzflag_1.10.6.20040515.bb
index e66703f561..1c139cccff 100644
--- a/recipes/bzflag/bzflag_1.10.6.20040515.bb
+++ b/recipes/bzflag/bzflag_1.10.6.20040515.bb
@@ -1,6 +1,8 @@
 DEPENDS = "adns ncurses virtual/libx11"
 SECTION = "x11/games"
 LICENSE = "LGPL"
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/bzflag/bzflag-${PV}.tar.bz2"
 S = "${WORKDIR}/bzflag-${PV}"
 
diff --git a/recipes/centerim/centerim.inc b/recipes/centerim/centerim.inc
index e0ec6f72ad..554ccf7fdc 100644
--- a/recipes/centerim/centerim.inc
+++ b/recipes/centerim/centerim.inc
@@ -8,5 +8,5 @@ DEPENDS = "openssl ncurses"
 inherit autotools
 
 SRC_URI = "http://www.centerim.org/download/releases/centerim-4.22.5.tar.gz "
-         
+
 EXTRA_OECONF = "--with-ssl --with-openssl=${STAGING_LIBDIR}/.."
diff --git a/recipes/centerim/centerim_4.22.5.bb b/recipes/centerim/centerim_4.22.5.bb
index 6947fb30dc..eb57c3e6f5 100644
--- a/recipes/centerim/centerim_4.22.5.bb
+++ b/recipes/centerim/centerim_4.22.5.bb
@@ -1,6 +1,6 @@
 require centerim.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "9bbbdb34ab678d29387171139ae835e1"
 SRC_URI[sha256sum] = "c68abb59043602a2b28fb55d45361d0b22fc1566848cc0c255580914df7b3eb3"
diff --git a/recipes/cscope/cscope_15.7a.bb b/recipes/cscope/cscope_15.7a.bb
index 851855b8db..3d54404213 100644
--- a/recipes/cscope/cscope_15.7a.bb
+++ b/recipes/cscope/cscope_15.7a.bb
@@ -2,6 +2,7 @@ DEPENDS = "ncurses"
 DESCRIPTION = "A text screen-based source browser."
 SECTION = "console/utils"
 LICENSE = "BSD"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cscope/cscope-${PV}.tar.bz2;name=src"
 SRC_URI[src.md5sum] = "da43987622ace8c36bbf14c15a350ec1"
diff --git a/recipes/dialog/dialog-static_1.1-20080819.bb b/recipes/dialog/dialog-static_1.1-20080819.bb
index bfe76908bb..ddb4ae3760 100644
--- a/recipes/dialog/dialog-static_1.1-20080819.bb
+++ b/recipes/dialog/dialog-static_1.1-20080819.bb
@@ -1,4 +1,6 @@
 require dialog.inc
+PR = "${INC_PR}.0"
+
 LDFLAGS += "-static"
 S="${WORKDIR}/dialog-${PV}"
 
diff --git a/recipes/dialog/dialog.inc b/recipes/dialog/dialog.inc
index 8fe0d98a2a..939363468e 100644
--- a/recipes/dialog/dialog.inc
+++ b/recipes/dialog/dialog.inc
@@ -5,6 +5,8 @@ DESCRIPTION = "Dialog lets you to present a variety of questions \
 or display messages using dialog boxes from a shell \
 script (or any scripting language)."
 
+INC_PR = "r1"
+
 SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz"
 
 inherit autotools
diff --git a/recipes/dialog/dialog_1.0-20050306.bb b/recipes/dialog/dialog_1.0-20050306.bb
index 030b016adf..a0645ebb23 100644
--- a/recipes/dialog/dialog_1.0-20050306.bb
+++ b/recipes/dialog/dialog_1.0-20050306.bb
@@ -1 +1,3 @@
 require dialog.inc
+PR = "${INC_PR}.0"
+
diff --git a/recipes/dialog/dialog_1.1-20080819.bb b/recipes/dialog/dialog_1.1-20080819.bb
index 260d2e49e1..4a0e8383e9 100644
--- a/recipes/dialog/dialog_1.1-20080819.bb
+++ b/recipes/dialog/dialog_1.1-20080819.bb
@@ -1,4 +1,5 @@
 require dialog.inc
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "3caebd641a9f337b980becb4444336c5"
 SRC_URI[sha256sum] = "c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9"
diff --git a/recipes/elvis/elvis_2.2.0.bb b/recipes/elvis/elvis_2.2.0.bb
index cff6f92472..0071a0e060 100644
--- a/recipes/elvis/elvis_2.2.0.bb
+++ b/recipes/elvis/elvis_2.2.0.bb
@@ -3,6 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "Perl Clarified Artistic License"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz"
 S = "${WORKDIR}/elvis-2.2_0"
diff --git a/recipes/emul/emul_1.0.5.bb b/recipes/emul/emul_1.0.5.bb
index cc0bcf30c9..8fcf64506a 100644
--- a/recipes/emul/emul_1.0.5.bb
+++ b/recipes/emul/emul_1.0.5.bb
@@ -3,7 +3,7 @@ SECTION = "libs/network"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "virtual/libusb0 ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://download.berlios.de/emul/emul-${PV}.tar.gz"
 
diff --git a/recipes/erlang/erlang_R11B.1.bb b/recipes/erlang/erlang_R11B.1.bb
index a2a30c9a36..dc24cd78cc 100644
--- a/recipes/erlang/erlang_R11B.1.bb
+++ b/recipes/erlang/erlang_R11B.1.bb
@@ -1,4 +1,7 @@
 include erlang.inc
+
+PR = "r1"
+
 DEPENDS += "erlang-native openssl"
 
 SRC_URI += "file://erts-configure.in.patch \
diff --git a/recipes/erlang/erlang_R13B01.bb b/recipes/erlang/erlang_R13B01.bb
index 570b3bbcc9..e2cc6ac61f 100644
--- a/recipes/erlang/erlang_R13B01.bb
+++ b/recipes/erlang/erlang_R13B01.bb
@@ -1,7 +1,7 @@
 include erlang.inc
 DEPENDS += "erlang-native openssl"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "\
             file://erts-emulator-Makefile.in.patch \
diff --git a/recipes/ettercap/ettercap-ng_0.7.3.bb b/recipes/ettercap/ettercap-ng_0.7.3.bb
index 701a19cab4..4da5e401ee 100644
--- a/recipes/ettercap/ettercap-ng_0.7.3.bb
+++ b/recipes/ettercap/ettercap-ng_0.7.3.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "virtual/libiconv libnet libpcap openssl libpcre ncurses zlib libtool"
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ettercap/ettercap-NG-${PV}.tar.gz \
            file://autotools.patch \
diff --git a/recipes/fluidsynth/fluidsynth_1.0.8.bb b/recipes/fluidsynth/fluidsynth_1.0.8.bb
index 5f7665709d..ecf716ca6b 100644
--- a/recipes/fluidsynth/fluidsynth_1.0.8.bb
+++ b/recipes/fluidsynth/fluidsynth_1.0.8.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "Fluidsynth is a software synthesizer"
 HOMEPAGE = "http://www.fluidsynth.org/"
 SECTION = "libs/multimedia"
 LICENSE = "GPLv2"
+PR = "r1"
+
 DEPENDS = "alsa-lib ncurses"
 
 SRC_URI = "http://savannah.nongnu.org/download/fluid/${P}.tar.gz"
diff --git a/recipes/frotz/frotz_2.42.bb b/recipes/frotz/frotz_2.42.bb
index f102305882..6faf415b6a 100644
--- a/recipes/frotz/frotz_2.42.bb
+++ b/recipes/frotz/frotz_2.42.bb
@@ -2,6 +2,8 @@ LICENSE = "GPL"
 DESCRIPTION = "Frotz is an interpreter for Infocom games and other Z-machine games."
 HOMEPAGE = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/"
 SECTION = "console/games"
+PR = "r1"
+
 DEPENDS = "ncurses"
 
 SRC_URI = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-${PV}.tar.gz \
diff --git a/recipes/frotz/frotz_2.43.bb b/recipes/frotz/frotz_2.43.bb
index 3a28295e4e..b59f7084dc 100644
--- a/recipes/frotz/frotz_2.43.bb
+++ b/recipes/frotz/frotz_2.43.bb
@@ -2,6 +2,8 @@ LICENSE = "GPL"
 DESCRIPTION = "Frotz is an interpreter for Infocom games and other Z-machine games."
 HOMEPAGE = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/"
 SECTION = "console/games"
+PR = "r1"
+
 DEPENDS = "ncurses"
 
 SRC_URI = "http://www.cs.csubak.edu/~dgriffi/proj/frotz/files/frotz-${PV}.tar.gz \
diff --git a/recipes/gdb/gdb_6.3.bb b/recipes/gdb/gdb_6.3.bb
index 7a227fcec0..0ebc2e00cf 100644
--- a/recipes/gdb/gdb_6.3.bb
+++ b/recipes/gdb/gdb_6.3.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv2"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI[md5sum] = "812de9e756d53c749ea5516d9ffa5905"
 SRC_URI[sha256sum] = "c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342"
diff --git a/recipes/gdb/gdb_6.4.bb b/recipes/gdb/gdb_6.4.bb
index ff9e3d45bb..9eff83f0e9 100644
--- a/recipes/gdb/gdb_6.4.bb
+++ b/recipes/gdb/gdb_6.4.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv2"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[md5sum] = "7dc98022ee96bba5331f195dc8a5491a"
 SRC_URI[sha256sum] = "719f2bbd79d55cdd6f5e31b49cec49df71ddb32a4439dba678de0e09330096da"
diff --git a/recipes/gdb/gdb_6.6.bb b/recipes/gdb/gdb_6.6.bb
index dab1c7df7e..24c193f9ca 100644
--- a/recipes/gdb/gdb_6.6.bb
+++ b/recipes/gdb/gdb_6.6.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv2"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://early_debug_in_nptl.patch;striplevel=0"
 
diff --git a/recipes/gdb/gdb_6.7.1.bb b/recipes/gdb/gdb_6.7.1.bb
index 5fe7bcdec9..9f599782c2 100644
--- a/recipes/gdb/gdb_6.7.1.bb
+++ b/recipes/gdb/gdb_6.7.1.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-PR = "r2"
+PR = "r3"
 
 DEFAULT_PREFERENCE_avr32 = "99"
 SRC_URI_avr32 = " http://avr32linux.org/twiki/pub/Main/GDBPatches/gdb-6.7.1.atmel.1.0.3.tar.bz2"
diff --git a/recipes/gdb/gdb_6.8.bb b/recipes/gdb/gdb_6.8.bb
index 51310f3c0e..630ca9ec09 100644
--- a/recipes/gdb/gdb_6.8.bb
+++ b/recipes/gdb/gdb_6.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv3"
 SRC_URI += "file://gcc-4.3-build-error.patch;striplevel=0 \
             file://gdb-6.8-fix-compile-karmic.patch"
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI[md5sum] = "925695333524108291dc4012c4c9cbb8"
 SRC_URI[sha256sum] = "a3c5455f30ffb3e6eeafb9e54598b48f9fbf46e3e99f431120360c183ddcc889"
diff --git a/recipes/gdb/gdb_7.0.bb b/recipes/gdb/gdb_7.0.bb
index df38a5f87e..96c267cdd0 100644
--- a/recipes/gdb/gdb_7.0.bb
+++ b/recipes/gdb/gdb_7.0.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "\
             file://gdb-6.8-fix-compile-karmic.patch"
diff --git a/recipes/gdb/gdb_7.1.bb b/recipes/gdb/gdb_7.1.bb
index 0a2abc7db3..082a51ecf5 100644
--- a/recipes/gdb/gdb_7.1.bb
+++ b/recipes/gdb/gdb_7.1.bb
@@ -1,7 +1,7 @@
 require gdb.inc
 LICENSE = "GPLv3"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://gdb-6.8-fix-compile-karmic.patch \
 	    file://gdb-tcsetpgrp.patch \
diff --git a/recipes/gettext/gettext_0.17.bb b/recipes/gettext/gettext_0.17.bb
index 0a8b6e822b..ff2ae74589 100644
--- a/recipes/gettext/gettext_0.17.bb
+++ b/recipes/gettext/gettext_0.17.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv3"
-PR = "r7"
+PR = "r8"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = "libxml2-native"
 PROVIDES = "virtual/libintl"
diff --git a/recipes/gettext/gettext_0.18.bb b/recipes/gettext/gettext_0.18.bb
index 98fabf9f43..b295afb811 100644
--- a/recipes/gettext/gettext_0.18.bb
+++ b/recipes/gettext/gettext_0.18.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The GNU internationalization library."
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPLv3"
-PR = "r1"
+PR = "r2"
 DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 DEPENDS_virtclass-native = "libxml2-native"
 PROVIDES = "virtual/libintl"
diff --git a/recipes/giftcurs/giftcurs_0.6.2.bb b/recipes/giftcurs/giftcurs_0.6.2.bb
index f95cdd36b9..f86a96f01c 100644
--- a/recipes/giftcurs/giftcurs_0.6.2.bb
+++ b/recipes/giftcurs/giftcurs_0.6.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DESCRIPTION = "giFTcurs is a cursed frontend to the giFT daemon and \
 has been described as 'seriously slick'. It wont work that well \
 without giFT, which you should have already."
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://fnord.csbnet.se/giftcurs/giFTcurs-${PV}.tar.gz \
 	   file://m4.patch"
diff --git a/recipes/gpm/gpm_1.20.1.bb b/recipes/gpm/gpm_1.20.1.bb
index c9422bbe75..f21f22fff9 100644
--- a/recipes/gpm/gpm_1.20.1.bb
+++ b/recipes/gpm/gpm_1.20.1.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 
-PR = "r3"
+PR = "r4"
 PARALLEL_MAKE = ""
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
diff --git a/recipes/gpm/gpm_1.99.7.bb b/recipes/gpm/gpm_1.99.7.bb
index bc24472e9d..4f5ef023b4 100644
--- a/recipes/gpm/gpm_1.99.7.bb
+++ b/recipes/gpm/gpm_1.99.7.bb
@@ -5,7 +5,7 @@ SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://arcana.linux.it/pub/gpm/gpm-${PV}.tar.bz2 \
 	   file://no-docs.patch \
diff --git a/recipes/gpsd/gpsd.inc b/recipes/gpsd/gpsd.inc
index 01a941b057..778afa567e 100644
--- a/recipes/gpsd/gpsd.inc
+++ b/recipes/gpsd/gpsd.inc
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "dbus-glib ncurses python"
 PROVIDES = "virtual/gpsd"
-INC_PR = "r7"
+INC_PR = "r8"
 
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
@@ -15,7 +15,7 @@ SRC_URI = "http://download.berlios.de/gpsd/gpsd-${PV}.tar.gz;name=gpsd \
            file://gpsd-default \
            file://gpsd \
            file://60-gpsd.rules"
-			   
+
 inherit autotools update-rc.d python-dir
 
 INITSCRIPT_NAME = "gpsd"
diff --git a/recipes/gutenprint/gutenprint_5.1.3.bb b/recipes/gutenprint/gutenprint_5.1.3.bb
index afe2ecd3f6..3ccb7eeb30 100644
--- a/recipes/gutenprint/gutenprint_5.1.3.bb
+++ b/recipes/gutenprint/gutenprint_5.1.3.bb
@@ -1,6 +1,6 @@
 require gutenprint.inc
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "glib-2.0 ijs ncurses cups tiff jpeg libpng gutenprint-native espgs"
 
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
 		--with-user-guide \
 		--with-samples \
 		--with-escputil \
-		 "		   		   
+		 "
 
 do_configure() {
         gnu-configize
diff --git a/recipes/hnb/hnb_1.9.17+1.9.18pre7.bb b/recipes/hnb/hnb_1.9.17+1.9.18pre7.bb
index d2c9f0b676..0f8eb453f0 100644
--- a/recipes/hnb/hnb_1.9.17+1.9.18pre7.bb
+++ b/recipes/hnb/hnb_1.9.17+1.9.18pre7.bb
@@ -2,6 +2,8 @@ DESCRIPTION = "hnb is a text-mode hierarchical outliner"
 SECTION = "console/pim"
 HOMEPAGE = "http://hnb.sf.net"
 LICENSE = "GPL"
+PR = "r1"
+
 DEPENDS = "ncurses"
 
 SRC_URI = "http://hnb.sourceforge.net/.files/hnb-1.9.18.pre7.tar.gz"
diff --git a/recipes/htop/htop_0.7.bb b/recipes/htop/htop_0.7.bb
index b42489f6f3..5697638fc1 100644
--- a/recipes/htop/htop_0.7.bb
+++ b/recipes/htop/htop_0.7.bb
@@ -3,12 +3,11 @@ HOMEPAGE = "http://htop.sf.net"
 SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPLv2"
+PR = "r2"
 
 DEPENDS = "ncurses"
-# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now
-RRECOMMENDS_${PN} = "ncurses-terminfo"
+RDEPENDS_${PN} = "ncurses-terminfo"
 
-PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/htop/htop-${PV}.tar.gz \
            file://remove-proc-test.patch"
 
diff --git a/recipes/inetutils/inetutils_1.4.2.bb b/recipes/inetutils/inetutils_1.4.2.bb
index fa38ade049..ec7934980b 100644
--- a/recipes/inetutils/inetutils_1.4.2.bb
+++ b/recipes/inetutils/inetutils_1.4.2.bb
@@ -6,6 +6,8 @@ networking utilities and servers including ftp, ftpd, rcp, \
 rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
 talkd, telnet, telnetd, tftp, tftpd, and uucpd."
 
+PR = "r1"
+
 SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
 	   file://configure.patch"
 
diff --git a/recipes/inetutils/inetutils_1.5.bb b/recipes/inetutils/inetutils_1.5.bb
index 0795f4708b..ea69de1c57 100644
--- a/recipes/inetutils/inetutils_1.5.bb
+++ b/recipes/inetutils/inetutils_1.5.bb
@@ -6,7 +6,7 @@ networking utilities and servers including ftp, ftpd, rcp, \
 rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
 talkd, telnet, telnetd, tftp, tftpd, and uucpd."
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
 "
diff --git a/recipes/inetutils/inetutils_1.8.bb b/recipes/inetutils/inetutils_1.8.bb
index d3332062cf..c6003b4ad7 100644
--- a/recipes/inetutils/inetutils_1.8.bb
+++ b/recipes/inetutils/inetutils_1.8.bb
@@ -6,7 +6,7 @@ networking utilities and servers including ftp, ftpd, rcp, \
 rexec, rlogin, rlogind, rsh, rshd, syslog, syslogd, talk, \
 talkd, telnet, telnetd, tftp, tftpd, and uucpd."
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
 "
diff --git a/recipes/iptraf/iptraf_3.0.0.bb b/recipes/iptraf/iptraf_3.0.0.bb
index 242ec13ebf..0943aa3abd 100644
--- a/recipes/iptraf/iptraf_3.0.0.bb
+++ b/recipes/iptraf/iptraf_3.0.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Heavyweight console network bandwidth monitor"
 LICENSE = "GPLv2"
 DEPENDS = "ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = " \
     ${DEBIAN_MIRROR}/main/i/iptraf/iptraf_${PV}.orig.tar.gz;name=archive \
diff --git a/recipes/iptstate/iptstate.inc b/recipes/iptstate/iptstate.inc
index 233526f48d..fef384c7f3 100644
--- a/recipes/iptstate/iptstate.inc
+++ b/recipes/iptstate/iptstate.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.phildev.net/iptstate/"
 SECTION = "console/network"
 LICENSE = "zlib"
 DEPENDS = "ncurses libnetfilter-conntrack"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/iptstate/iptstate-${PV}.tar.bz2;name=iptstate-${PV}"
 
diff --git a/recipes/irssi/irssi_0.8.10.bb b/recipes/irssi/irssi_0.8.10.bb
index 6af65694bc..68634f7a77 100644
--- a/recipes/irssi/irssi_0.8.10.bb
+++ b/recipes/irssi/irssi_0.8.10.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS += "ncurses glib-2.0"
-PR = "r2"
+PR = "r3"
 
 PACKAGES += "${PN}-common"
 FILES_${PN} = "${bindir}/irssi"
diff --git a/recipes/irssi/irssi_0.8.13.bb b/recipes/irssi/irssi_0.8.13.bb
index 363087b212..df56deebf8 100644
--- a/recipes/irssi/irssi_0.8.13.bb
+++ b/recipes/irssi/irssi_0.8.13.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://irssi.org/"
 SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS += "ncurses glib-2.0"
+PR = "r1"
 
 PACKAGES += "${PN}-common"
 FILES_${PN} = "${bindir}/irssi"
diff --git a/recipes/irssi/irssi_svn.bb b/recipes/irssi/irssi_svn.bb
index 1fc31515d9..1848400b80 100644
--- a/recipes/irssi/irssi_svn.bb
+++ b/recipes/irssi/irssi_svn.bb
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPL"
 DEPENDS += "ncurses glib-2.0"
 PV = "0.8.11+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/joe/joe_3.1.bb b/recipes/joe/joe_3.1.bb
index 003721b4df..96e78f7c12 100644
--- a/recipes/joe/joe_3.1.bb
+++ b/recipes/joe/joe_3.1.bb
@@ -2,11 +2,10 @@ SECTION = "console/utils"
 DESCRIPTION = "Console text editor with good functionality, good choice for vi-haters."
 HOMEPAGE = "http://joe-editor.sourceforge.net/"
 LICENSE ="GPL"
-# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now
-RRECOMMENDS_${PN} = "ncurses-terminfo"
+RDEPENDS_${PN} = "ncurses-terminfo"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/joe-editor/joe-${PV}.tar.gz"
-PR = "r2"
+PR = "r3"
 
 inherit autotools
 
diff --git a/recipes/lcd4linux/lcd4linux_0.10.0.bb b/recipes/lcd4linux/lcd4linux_0.10.0.bb
index 5c7272bd84..ecb64b43d3 100644
--- a/recipes/lcd4linux/lcd4linux_0.10.0.bb
+++ b/recipes/lcd4linux/lcd4linux_0.10.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "virtual/libusb0 ncurses readline virtual/libx11"
 
 PV = "0.10.0+0.10.1-RC2"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
            file://libusb-compat.diff \ 
diff --git a/recipes/lcd4linux/lcd4linux_0.11.0-SVN.bb b/recipes/lcd4linux/lcd4linux_0.11.0-SVN.bb
index 910ce42d18..a202fd075e 100644
--- a/recipes/lcd4linux/lcd4linux_0.11.0-SVN.bb
+++ b/recipes/lcd4linux/lcd4linux_0.11.0-SVN.bb
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 DEPENDS = "virtual/libusb0 ncurses readline virtual/libx11"
 
 PV = "0.11.0-SVN"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = " --with-glib-prefix=${STAGING_LIBDIR}/.. \
 		--with-glib-exec-prefix=${STAGING_LIBDIR}/.. \
diff --git a/recipes/lcdproc/lcdproc_0.4.5.bb b/recipes/lcdproc/lcdproc_0.4.5.bb
index c70977c35d..fc63e2a5e4 100644
--- a/recipes/lcdproc/lcdproc_0.4.5.bb
+++ b/recipes/lcdproc/lcdproc_0.4.5.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://lcdproc.org"
 LICENSE ="GPL"
 PRIORITY = "optional"
 SECTION = "utils"
+PR = "r1"
 
 DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
 
diff --git a/recipes/lcdproc/lcdproc_0.4.99+cvs20060123.bb b/recipes/lcdproc/lcdproc_0.4.99+cvs20060123.bb
index 31d88c8347..45c8065af4 100644
--- a/recipes/lcdproc/lcdproc_0.4.99+cvs20060123.bb
+++ b/recipes/lcdproc/lcdproc_0.4.99+cvs20060123.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://lcdproc.org"
 LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "utils"
+PR = "r1"
 
 DEPENDS = "${@((bb.data.getVar('LCDPROC_DRIVERS',d) or 'curses,text').find('curses') != -1) and 'ncurses' or ''}"
 RRECOMMENDS_lcdproc = "lcdd"
diff --git a/recipes/lcdproc/lcdproc_0.5.0.bb b/recipes/lcdproc/lcdproc_0.5.0.bb
index f5fd037462..6bed4d2dff 100644
--- a/recipes/lcdproc/lcdproc_0.5.0.bb
+++ b/recipes/lcdproc/lcdproc_0.5.0.bb
@@ -1,3 +1,5 @@
 require lcdproc5.inc
+PR = "r1"
+
 SRC_URI[md5sum] = "4b67e421c19063fa322611a849ab5b80"
 SRC_URI[sha256sum] = "a7567f3f68517008e68d15b33630f36ba539540fbb361a2f9c440ce2ceb8393b"
diff --git a/recipes/lcdproc/lcdproc_0.5.1.bb b/recipes/lcdproc/lcdproc_0.5.1.bb
index 3816a3a184..3b821f4314 100644
--- a/recipes/lcdproc/lcdproc_0.5.1.bb
+++ b/recipes/lcdproc/lcdproc_0.5.1.bb
@@ -3,7 +3,7 @@ require lcdproc5.inc
 DEPENDS += "libg15 g15daemon libg15render"
 DEPENDS_lcdd-driver-all += "lcdd-driver-g15"
 
-PR = "r3"
+PR = "r4"
 
 do_install_append () {
 	# binaries
diff --git a/recipes/lcdproc/lcdproc_cvs.bb b/recipes/lcdproc/lcdproc_cvs.bb
index b330f88978..b27f56a3e8 100644
--- a/recipes/lcdproc/lcdproc_cvs.bb
+++ b/recipes/lcdproc/lcdproc_cvs.bb
@@ -6,6 +6,7 @@ LICENSE = "GPL"
 PRIORITY = "optional"
 SECTION = "utils"
 PV = "0.4.99+cvs${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/recipes/less/less_418.bb b/recipes/less/less_418.bb
index 8a6300193e..ed36bb87cf 100644
--- a/recipes/less/less_418.bb
+++ b/recipes/less/less_418.bb
@@ -5,6 +5,7 @@ HOMEPAGE = "http://www.greenwoodsoftware.com/"
 SECTION = "console/utils"
 LICENSE = "BSD"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz"
 
diff --git a/recipes/libedit/libedit_20050118.bb b/recipes/libedit/libedit_20050118.bb
index 096316530c..4c5ae197e3 100644
--- a/recipes/libedit/libedit_20050118.bb
+++ b/recipes/libedit/libedit_20050118.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libedit/"
 SECTION = "libs"
 LICENSE="BSD"
 DEPENDS = "ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/libedit-${PV}.tar.bz2 \
 	file://20031222-debian-to-gentoo.patch \
diff --git a/recipes/libtorrent/rtorrent_0.8.6.bb b/recipes/libtorrent/rtorrent_0.8.6.bb
index 38b32e4bb0..d2a4750632 100644
--- a/recipes/libtorrent/rtorrent_0.8.6.bb
+++ b/recipes/libtorrent/rtorrent_0.8.6.bb
@@ -7,7 +7,7 @@ DEPENDS = "libtorrent curl ncurses gnutls libgpg-error"
 SRC_URI = "http://libtorrent.rakshasa.no/downloads/rtorrent-${PV}.tar.gz \
            file://autoconf-cross-fix.patch"
 
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
diff --git a/recipes/lxt/lxt_1.0.bb b/recipes/lxt/lxt_1.0.bb
index c7a4cf5fb1..70385b9c94 100644
--- a/recipes/lxt/lxt_1.0.bb
+++ b/recipes/lxt/lxt_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "console/utils"
 DESCRIPTION = "lxt ncurses filemanager xtree clone"
 PRIORITY = "optional"
 DEPENDS = "ncurses"
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/lxt-1.0"
+PR = "r1"
 
 SRC_URI = "http://www.xtreefanpage.org/download/lxt-1.0.tgz \
 	   file://lxt.patch"
diff --git a/recipes/mc/mc.inc b/recipes/mc/mc.inc
index db52b6b095..ef0ae94cda 100644
--- a/recipes/mc/mc.inc
+++ b/recipes/mc/mc.inc
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 PRIORITY = "optional"
 DEPENDS = "ncurses glib-2.0 glib-2.0-native"
 RDEPENDS_${PN} = "ncurses-terminfo"
-INC_PR = "r5"
+INC_PR = "r6"
 
 SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-${PV}.tar.gz"
 
diff --git a/recipes/mcabber/mcabber_0.9.9.bb b/recipes/mcabber/mcabber_0.9.9.bb
index 8177a50480..01880f1487 100644
--- a/recipes/mcabber/mcabber_0.9.9.bb
+++ b/recipes/mcabber/mcabber_0.9.9.bb
@@ -4,6 +4,7 @@ AUTHOR = "Mikael Berthe"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "ncurses openssl gpgme"
+PR = "r1"
 
 SRC_URI = "http://www.lilotux.net/~mikael/mcabber/files/mcabber-${PV}.tar.bz2"
 
diff --git a/recipes/meta/meta-mamona.bb b/recipes/meta/meta-mamona.bb
index 6a30901fbb..2e1f018b74 100644
--- a/recipes/meta/meta-mamona.bb
+++ b/recipes/meta/meta-mamona.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Meta package for Mamona"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit meta
 EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes/meta/openprotium-packages.bb b/recipes/meta/openprotium-packages.bb
index 7d66ee5d61..dacacd1562 100644
--- a/recipes/meta/openprotium-packages.bb
+++ b/recipes/meta/openprotium-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the Openprotium on the iomega Storcenter"
 HOMEPAGE = "http://www.openprotium.org"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 CONFLICTS = "db3"
 PROVIDES += "${OPENPROTIUM_IMAGENAME}-packages"
 
diff --git a/recipes/meta/oplinux-packages.bb b/recipes/meta/oplinux-packages.bb
index 190f323838..d828eedea3 100644
--- a/recipes/meta/oplinux-packages.bb
+++ b/recipes/meta/oplinux-packages.bb
@@ -4,7 +4,7 @@
 DESCRIPTION = "Packages that are compatible with the OPLinux distro"
 HOMEPAGE = "http://www.digital-opsis/oplinux"
 LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
 PROVIDES += "${OPLINUX_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes/meta/slugos-native.bb b/recipes/meta/slugos-native.bb
index 4dd1937ad9..c8d1e8ed0f 100644
--- a/recipes/meta/slugos-native.bb
+++ b/recipes/meta/slugos-native.bb
@@ -5,7 +5,7 @@
 #
 DESCRIPTION = "Packages that are required for the SlugOS native build environment"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 INHIBIT_DEFAULT_DEPS = "1"
 EXCLUDE_FROM_WORLD = "1"
diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb
index 0e4ff8b9c6..4e7b2ffd16 100644
--- a/recipes/meta/slugos-packages.bb
+++ b/recipes/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r68"
+PR = "r69"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
diff --git a/recipes/micro-emacs/micro-emacs_20060909.bb b/recipes/micro-emacs/micro-emacs_20060909.bb
index 1fb7af153b..310389c762 100644
--- a/recipes/micro-emacs/micro-emacs_20060909.bb
+++ b/recipes/micro-emacs/micro-emacs_20060909.bb
@@ -3,6 +3,7 @@ SECTION = "console/utils"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
+PR = "r1"
 
 S = "${WORKDIR}/me060909"
 
diff --git a/recipes/mikmod/mikmod_3.2.2-beta1.bb b/recipes/mikmod/mikmod_3.2.2-beta1.bb
index 91b140b259..86bf79be09 100644
--- a/recipes/mikmod/mikmod_3.2.2-beta1.bb
+++ b/recipes/mikmod/mikmod_3.2.2-beta1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A module player based on libmikmod."
 SECTION = "console/multimedia"
 HOMEPAGE = "http://mikmod.raphnet.net"
 DEPENDS = "ncurses libmikmod"
-PR = "r1"
+PR = "r2"
 LICENSE = "GPL"
 SRC_URI = "http://mikmod.raphnet.net/files/mikmod-${PV}.tar.bz2 \
            file://m4.patch"
diff --git a/recipes/minicom/minicom_2.1.bb b/recipes/minicom/minicom_2.1.bb
index 36880a285f..de73211f29 100644
--- a/recipes/minicom/minicom_2.1.bb
+++ b/recipes/minicom/minicom_2.1.bb
@@ -6,6 +6,8 @@ SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
 	file://gcc4-scope.patch \
 	file://gcc4-scope2.patch"
 
+PR = "r1"
+
 inherit autotools gettext
 
 do_install() {
diff --git a/recipes/minicom/minicom_2.3.bb b/recipes/minicom/minicom_2.3.bb
index 69939e6098..9042594b22 100644
--- a/recipes/minicom/minicom_2.3.bb
+++ b/recipes/minicom/minicom_2.3.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
 	file://rename-conflicting-functions.patch \
 	"
-
+PR = "r1"
 inherit autotools gettext
 
 do_install() {
diff --git a/recipes/moc/moc_2.4.3.bb b/recipes/moc/moc_2.4.3.bb
index 3ce627bf6b..badc7afb96 100644
--- a/recipes/moc/moc_2.4.3.bb
+++ b/recipes/moc/moc_2.4.3.bb
@@ -4,6 +4,7 @@ HOMEPAGE = "http://moc.daper.net/"
 SECTION = "console/multimedia"
 LICENSE = "GPL"
 DEPENDS = "ncurses flac"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.daper.net/pub/soft/moc/stable/${PN}-${PV}.tar.bz2"
 
diff --git a/recipes/mp3blaster/mp3blaster_3.1.3.bb b/recipes/mp3blaster/mp3blaster_3.1.3.bb
index 337d37e06b..207ea4a48c 100644
--- a/recipes/mp3blaster/mp3blaster_3.1.3.bb
+++ b/recipes/mp3blaster/mp3blaster_3.1.3.bb
@@ -2,7 +2,7 @@ LICENSE = "GPL"
 SECTION = "console/multimedia"
 DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libsidplay libogg libvorbis"
-
+PR = "r1"
 SRC_URI = "http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-${PV}.tar.gz \
 	   file://includedir.patch"
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.0.bb b/recipes/mp3blaster/mp3blaster_3.2.0.bb
index d57c3acfe7..fc1f6b69bc 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.0.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.0.bb
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 SECTION = "console/multimedia"
 DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libsidplay libogg libvorbis"
+PR = "r1"
 
 SRC_URI = "http://www.stack.nl/~brama/mp3blaster/src/mp3blaster-${PV}.tar.gz \
 	   file://includedir.patch"
diff --git a/recipes/mp3blaster/mp3blaster_3.2.3.bb b/recipes/mp3blaster/mp3blaster_3.2.3.bb
index 4df85b350e..4c32bf35e4 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.3.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.3.bb
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 SECTION = "console/multimedia"
 DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libogg libvorbis"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz file://includedir.patch"
 
diff --git a/recipes/mp3blaster/mp3blaster_3.2.5.bb b/recipes/mp3blaster/mp3blaster_3.2.5.bb
index 3a80a5ac18..a8020d9e40 100644
--- a/recipes/mp3blaster/mp3blaster_3.2.5.bb
+++ b/recipes/mp3blaster/mp3blaster_3.2.5.bb
@@ -2,6 +2,7 @@ LICENSE = "GPL"
 SECTION = "console/multimedia"
 DESCRIPTION = "A console MP3 player based on ncurses"
 DEPENDS = "ncurses libogg libvorbis"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/mp3blaster/mp3blaster-${PV}.tar.gz;name=tarball \
            file://includedir.patch"
diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb
index 1206b51e70..83229af949 100644
--- a/recipes/mplayer/mplayer-maemo_svn.bb
+++ b/recipes/mplayer/mplayer-maemo_svn.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE_avr32 = "-1"
 SRCREV = "6952"
 PV = "0.0+1.0rc1+svnr${SRCPV}"
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 RCONFLICTS_${PN} = "mplayer"
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc1.bb b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
index 5f023942a8..271d92b8d4 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc1.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc1.bb
@@ -41,7 +41,7 @@ ARM_INSTRUCTION_SET = "ARM"
 
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
-PR = "r19"
+PR = "r20"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
index 298aa7e537..4c4d590e7d 100644
--- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb
+++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb
@@ -46,7 +46,7 @@ ARM_INSTRUCTION_SET = "ARM"
 RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
-PR = "r15"
+PR = "r16"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/mplayer/mplayer_git.bb b/recipes/mplayer/mplayer_git.bb
index ca41174a0a..b9cb16cdda 100644
--- a/recipes/mplayer/mplayer_git.bb
+++ b/recipes/mplayer/mplayer_git.bb
@@ -35,7 +35,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc4+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_shr = "2"
 
diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb
index 13ffb897c9..42907d196d 100644
--- a/recipes/mplayer/mplayer_svn.bb
+++ b/recipes/mplayer/mplayer_svn.bb
@@ -43,7 +43,7 @@ RCONFLICTS_${PN} = "mplayer-atty"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc3+svnr${SRCPV}"
-PR = "r24"
+PR = "r25"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 DEFAULT_PREFERENCE_shr = "1"
diff --git a/recipes/musicpd/ncmpc_0.11.1.bb b/recipes/musicpd/ncmpc_0.11.1.bb
index 4e19e0cd11..93909a5d31 100644
--- a/recipes/musicpd/ncmpc_0.11.1.bb
+++ b/recipes/musicpd/ncmpc_0.11.1.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://www.musicpd.org/ncmpc.shtml"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 DEPENDS = "ncurses glib-2.0"
+PR = "r1"
 
 SRC_URI = "http://mercury.chem.pitt.edu/~shank/ncmpc-${PV}.tar.gz"
 
diff --git a/recipes/mutt/mutt_1.5.15.bb b/recipes/mutt/mutt_1.5.15.bb
index 6fa15869de..dadeda0b07 100644
--- a/recipes/mutt/mutt_1.5.15.bb
+++ b/recipes/mutt/mutt_1.5.15.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
            http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.nntp.2.gz;apply=yes;name=patch1 \
            http://mutt.org.ua/download/mutt-1.5.15/patch-1.5.15.vvv.initials.gz;apply=yes;name=patch2 \
diff --git a/recipes/mutt/mutt_1.5.19.bb b/recipes/mutt/mutt_1.5.19.bb
index e6ae2f7479..672e629ee3 100644
--- a/recipes/mutt/mutt_1.5.19.bb
+++ b/recipes/mutt/mutt_1.5.19.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz \
            file://patch-1.5.19.sidebar.20090522.txt;apply=yes \
 	   file://529838-gnutls-autoconf.patch \
diff --git a/recipes/mutt/mutt_1.5.4i.bb b/recipes/mutt/mutt_1.5.4i.bb
index 8237a093a5..201580ae74 100644
--- a/recipes/mutt/mutt_1.5.4i.bb
+++ b/recipes/mutt/mutt_1.5.4i.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.rr.compressed.gz;apply=yes;name=patch1 \
 	   http://mutt.kiev.ua/download/mutt-1.5.4/patch-1.5.4.vvv.nntp.gz;apply=yes;name=patch2 \
diff --git a/recipes/mutt/mutt_1.5.9i.bb b/recipes/mutt/mutt_1.5.9i.bb
index 700834d3e9..46781212a4 100644
--- a/recipes/mutt/mutt_1.5.9i.bb
+++ b/recipes/mutt/mutt_1.5.9i.bb
@@ -7,7 +7,7 @@ bindings, keyboard macros, mail threading, regular expression \
 searches, and a powerful pattern matching language for selecting \
 groups of messages."
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 SRC_URI = "ftp://ftp.mutt.org/mutt/devel/mutt-${PV}.tar.gz;name=archive \
 	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.rr.compressed.gz;apply=yes;name=rr \
 	   http://www.mutt.org.ua/download/mutt-1.5.9/patch-1.5.9.vvv.nntp.gz;apply=yes;name=nntp \
diff --git a/recipes/mysql/mysql5_5.1.40.inc b/recipes/mysql/mysql5_5.1.40.inc
index 363273f6a0..aa609479e6 100644
--- a/recipes/mysql/mysql5_5.1.40.inc
+++ b/recipes/mysql/mysql5_5.1.40.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \
            file://configure.in.patch \
diff --git a/recipes/mysql/mysql_4.1.22.bb b/recipes/mysql/mysql_4.1.22.bb
index d3a4bc9083..a97d130f88 100644
--- a/recipes/mysql/mysql_4.1.22.bb
+++ b/recipes/mysql/mysql_4.1.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.mysql.com/"
 SECTION = "libs"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://downloads.mysql.com/archives/mysql-4.1/mysql-${PV}.tar.gz \
            file://autofoo.patch \
diff --git a/recipes/naim/naim_0.11.8.3.1.bb b/recipes/naim/naim_0.11.8.3.1.bb
index b3eac7c60e..a9108389a9 100644
--- a/recipes/naim/naim_0.11.8.3.1.bb
+++ b/recipes/naim/naim_0.11.8.3.1.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "A console AIM/IRC/ICQ and Lily client"
 SECTION = "console/apps"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "http://naim.googlecode.com/files/naim-0.11.8.3.1.tar.bz2"
 
diff --git a/recipes/nano/nano.inc b/recipes/nano/nano.inc
index 41f21ecc72..cc8c75d1c4 100644
--- a/recipes/nano/nano.inc
+++ b/recipes/nano/nano.inc
@@ -5,10 +5,9 @@ HOMEPAGE = "http://www.nano-editor.org/"
 LICENSE = "GPLv2"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now
-RRECOMMENDS_${PN} = "ncurses-terminfo"
+RDEPENDS_${PN} = "ncurses-terminfo"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 PV_MAJOR = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
diff --git a/recipes/ncdu/ncdu_1.3.bb b/recipes/ncdu/ncdu_1.3.bb
index a51af712df..9de18f00fd 100644
--- a/recipes/ncdu/ncdu_1.3.bb
+++ b/recipes/ncdu/ncdu_1.3.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "NCurses Disk Usage"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "http://dev.yorhel.nl/download/ncdu-${PV}.tar.gz"
 
diff --git a/recipes/ncurses/ncurses_5.7.bb b/recipes/ncurses/ncurses_5.7.bb
index ab029ae309..57374eca6b 100644
--- a/recipes/ncurses/ncurses_5.7.bb
+++ b/recipes/ncurses/ncurses_5.7.bb
@@ -6,9 +6,6 @@ PATCHDATE = "20100501"
 PKGV = "${PV}+${PATCHDATE}"
 PR = "r11"
 
-# recipe is experimental for now...
-DEFAULT_PREFERENCE = "-99"
-
 DEPENDS = "ncurses-native unifdef-native"
 DEPENDS_virtclass-native = "unifdef-native"
 
diff --git a/recipes/netkit-telnet/netkit-telnet_0.17.bb b/recipes/netkit-telnet/netkit-telnet_0.17.bb
index 2b935f702c..317cb79b78 100644
--- a/recipes/netkit-telnet/netkit-telnet_0.17.bb
+++ b/recipes/netkit-telnet/netkit-telnet_0.17.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "netkit-telnet includes the telnet daemon and client."
 DEPENDS = "ncurses"
 LICENSE = "BSD"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz \
            file://netkit-telnet-debian_0.17-36.diff \
diff --git a/recipes/nmixer/nmixer_2.0.bb b/recipes/nmixer/nmixer_2.0.bb
index 641a00ceeb..2189b1ca62 100644
--- a/recipes/nmixer/nmixer_2.0.bb
+++ b/recipes/nmixer/nmixer_2.0.bb
@@ -3,6 +3,7 @@ SECTION = "console/multimedia"
 PRIORITY = "optional"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
+PR = "r1"
 SRC_URI = "http://www.stack.nl/~brama/projects/nmixer/src/nmixer-${PV}.tar.gz"
 
 inherit autotools
diff --git a/recipes/nmon/nmon_13g.bb b/recipes/nmon/nmon_13g.bb
index 0aa4095c75..623171ae2e 100644
--- a/recipes/nmon/nmon_13g.bb
+++ b/recipes/nmon/nmon_13g.bb
@@ -3,6 +3,7 @@ HOMEPAGE = "http://nmon.sf.net"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon13g.c"
 
diff --git a/recipes/nonworking/r/r_2.0.0.bb b/recipes/nonworking/r/r_2.0.0.bb
index 0815869fcc..ce25c19fdc 100644
--- a/recipes/nonworking/r/r_2.0.0.bb
+++ b/recipes/nonworking/r/r_2.0.0.bb
@@ -4,6 +4,7 @@ linear and nonlinear modelling, statistical tests, time series analysis, classif
 SECTION = "console/scientific"
 PRIORITY = "optional"
 DEPENDS = "ncurses readline less perl-native r-native"
+PR = "r1"
 
 SRC_URI = "http://www.stats.bris.ac.uk/R/src/base/R-2/R-${PV}.tar.gz \
 	file://configure.patch \
diff --git a/recipes/nonworking/tetex/tetex_3.0.bb b/recipes/nonworking/tetex/tetex_3.0.bb
index ee0f84c010..85fa6df348 100644
--- a/recipes/nonworking/tetex/tetex_3.0.bb
+++ b/recipes/nonworking/tetex/tetex_3.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.tug.org/tetex"
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "tetex-native flex gd ncurses libpng t1lib virtual/libx11 libxau libxext libxt zlib"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "ftp://dante.ctan.org/tex-archive/systems/unix/teTeX/current/distrib/tetex-src-${PV}.tar.gz \
            file://configure.patch"
diff --git a/recipes/nzbget/nzbget.inc b/recipes/nzbget/nzbget.inc
index 33dac3156e..0a5d1022c5 100644
--- a/recipes/nzbget/nzbget.inc
+++ b/recipes/nzbget/nzbget.inc
@@ -3,7 +3,7 @@ SECTION = "net"
 LICENSE = "GPL"
 HOMEPAGE = "http://nzbget.sourceforge.net/Main_Page"
 DEPENDS = "libsigc++-2.0 libpar2 ncurses libxml2"
-INC_PR = "r0"
+INC_PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nzbget/nzbget-stable/nzbget-${PV}.tar.gz"
 S = "${WORKDIR}/nzbget-${PV}"
diff --git a/recipes/octave/octave.inc b/recipes/octave/octave.inc
index f7c29788ff..f28c9842d6 100644
--- a/recipes/octave/octave.inc
+++ b/recipes/octave/octave.inc
@@ -2,6 +2,8 @@ DESCRIPTION = "Matlab alternative for numerical computations"
 HOMEPAGE = "http://www.gnu.org/software/octave/"
 SECTION = "console/scientific"
 LICENSE = "GPL"
+INC_PR = "r3"
+
 DEPENDS = "gperf-native readline ncurses fftw"
 RDEPENDS_${PN} = "libfftw3"
 # fftw compiled with --disable-fortran
diff --git a/recipes/octave/octave_2.1.73.bb b/recipes/octave/octave_2.1.73.bb
index 6d9ead52bf..5179a402a3 100644
--- a/recipes/octave/octave_2.1.73.bb
+++ b/recipes/octave/octave_2.1.73.bb
@@ -2,7 +2,7 @@ require octave.inc
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/obsolete/${PN}-${PV}.tar.gz"
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "libcruft-dev liboctave-dev liboctinterp-dev"
 
diff --git a/recipes/octave/octave_2.9.19.bb b/recipes/octave/octave_2.9.19.bb
index d3d8f3e3a5..dd4a3e93fc 100644
--- a/recipes/octave/octave_2.9.19.bb
+++ b/recipes/octave/octave_2.9.19.bb
@@ -6,7 +6,7 @@ SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
 SRC_URI[md5sum] = "32cb8153463ebc6ab27bee8b4e538b1a"
 SRC_URI[sha256sum] = "c888ee643451396fc2677a16577d9a2b31cac1b816769d5c915c1a82bbea3cc4"
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
diff --git a/recipes/octave/octave_3.0.0.bb b/recipes/octave/octave_3.0.0.bb
index 017a91f1f4..c12113c799 100644
--- a/recipes/octave/octave_3.0.0.bb
+++ b/recipes/octave/octave_3.0.0.bb
@@ -3,7 +3,7 @@ require octave.inc
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch"
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
 	     libcruft-dev liboctave-dev liboctinterp-dev \
diff --git a/recipes/octave/octave_3.0.3.bb b/recipes/octave/octave_3.0.3.bb
index b994f61ad4..bc6917819f 100644
--- a/recipes/octave/octave_3.0.3.bb
+++ b/recipes/octave/octave_3.0.3.bb
@@ -1,6 +1,6 @@
 require octave.inc
 
-PR = "r2"
+PR = "${INC_PR}.0"
 
 SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
            file://configure.patch"
diff --git a/recipes/octave/octave_3.2.4.bb b/recipes/octave/octave_3.2.4.bb
index d2d4d4f7e4..5c1f4b2c83 100644
--- a/recipes/octave/octave_3.2.4.bb
+++ b/recipes/octave/octave_3.2.4.bb
@@ -1,4 +1,5 @@
 DEFAULT_PREFERENCE = "-1"
+PR = "${INC_PR}.0"
 
 require octave.inc
 
diff --git a/recipes/orpheus/orpheus_1.5.bb b/recipes/orpheus/orpheus_1.5.bb
index 69a416c3ae..de4ef5525f 100644
--- a/recipes/orpheus/orpheus_1.5.bb
+++ b/recipes/orpheus/orpheus_1.5.bb
@@ -4,6 +4,8 @@ window-driven audio player application for CDs and files in \
 MP3 and Vorbis OGG format."
 DEPENDS = "ncurses"
 LICENSE = "GPL"
+PR = "r1"
+
 SRC_URI = "http://thekonst.net/download/orpheus-${PV}.tar.bz2 \
 	   file://m4.patch"
 S = "${WORKDIR}/orpheus-${PV}"
diff --git a/recipes/pacemaker/pacemaker_1.0.9.1.bb b/recipes/pacemaker/pacemaker_1.0.9.1.bb
index 55a050da06..eac6aaef0e 100644
--- a/recipes/pacemaker/pacemaker_1.0.9.1.bb
+++ b/recipes/pacemaker/pacemaker_1.0.9.1.bb
@@ -16,7 +16,7 @@ DEPENDS = " \
 	"
 RDEPENDS_${PN} += "openais"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = " \
 	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2 \
diff --git a/recipes/perl/libcurses-perl_1.28.bb b/recipes/perl/libcurses-perl_1.28.bb
index 873533cd01..6b4a886a24 100644
--- a/recipes/perl/libcurses-perl_1.28.bb
+++ b/recipes/perl/libcurses-perl_1.28.bb
@@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL"
 DEPENDS = "ncurses"
 BBCLASSEXTEND = "native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GI/GIRAFFED/Curses-${PV}.tgz;name=curses-perl-${PV}"
 SRC_URI[curses-perl-1.28.md5sum] = "ed9f7ddf2d90f4266da91c3dc9fad9c9"
diff --git a/recipes/pidgin/pidgin.inc b/recipes/pidgin/pidgin.inc
index 32152686cd..b93a6d1cf9 100644
--- a/recipes/pidgin/pidgin.inc
+++ b/recipes/pidgin/pidgin.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "multi-protocol instant messaging client"
 SECTION = "x11/network"
 LICENSE = "GPL"
 DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus"
-INC_PR = "r2"
+INC_PR = "r3"
 
 inherit autotools gettext pkgconfig gconf
 
diff --git a/recipes/pine/pine_4.64.bb b/recipes/pine/pine_4.64.bb
index bd2d16e8c4..9e66e465cc 100644
--- a/recipes/pine/pine_4.64.bb
+++ b/recipes/pine/pine_4.64.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Pine(R) - a Program for Internet News & Email"
 SECTION = "console/network"
 LICENSE = "Pine"
 DEPENDS = "ncurses openssl"
+PR = "r1"
 RDEPENDS_pine = "pico"
 HOMEPAGE = "http://www.washington.edu/pine/"
 
diff --git a/recipes/powertop/powertop.inc b/recipes/powertop/powertop.inc
index a113b93bee..37944b74a4 100644
--- a/recipes/powertop/powertop.inc
+++ b/recipes/powertop/powertop.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.linuxpowertop.org/"
 LICENSE = "GPLv2"
 DEPENDS = "virtual/libintl ncurses"
 
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
 	   file://ldflags.patch \
diff --git a/recipes/procps/procps.inc b/recipes/procps/procps.inc
index d720310bdb..fbad8e71bd 100644
--- a/recipes/procps/procps.inc
+++ b/recipes/procps/procps.inc
@@ -7,10 +7,9 @@ SECTION = "base"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-# actually RDEPENDS, but ncurses-terminfo is only in ncurses-5.7, so RRECOMMENDS for now
-RRECOMMENDS_${PN} = "ncurses-terminfo"
+RDEPENDS_${PN} = "ncurses-terminfo"
 
-INC_PR = "r11"
+INC_PR = "r12"
 
 SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz;name=tarball \
 	   file://sysctl.conf \
diff --git a/recipes/psmisc/psmisc_20.2.bb b/recipes/psmisc/psmisc_20.2.bb
index 9c72ed85e4..0e8ab6e2d0 100644
--- a/recipes/psmisc/psmisc_20.2.bb
+++ b/recipes/psmisc/psmisc_20.2.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "procfs tools"
 SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "ncurses"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
 	   file://gettext.patch"
diff --git a/recipes/psmisc/psmisc_21.8.bb b/recipes/psmisc/psmisc_21.8.bb
index 981f8726f2..6f1ac8baed 100644
--- a/recipes/psmisc/psmisc_21.8.bb
+++ b/recipes/psmisc/psmisc_21.8.bb
@@ -1,5 +1,5 @@
 require psmisc.inc
-PR = "r2"
+PR = "r3"
 SRC_URI += "file://signames-header-fix.patch"
 
 SRC_URI[md5sum] = "d6276e071c10ddf4b0d98856e5573e1a"
diff --git a/recipes/psmisc/psmisc_22.2.bb b/recipes/psmisc/psmisc_22.2.bb
index f9c59a2084..a883f6dc35 100644
--- a/recipes/psmisc/psmisc_22.2.bb
+++ b/recipes/psmisc/psmisc_22.2.bb
@@ -1,5 +1,5 @@
 require psmisc.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "77737c817a40ef2c160a7194b5b64337"
 SRC_URI[sha256sum] = "6bca237485a352362133792e000a3c8e367a26b0312c5c607db7c2a97717d15f"
diff --git a/recipes/quagga/quagga.inc b/recipes/quagga/quagga.inc
index 4c95b7460e..8e86970b93 100644
--- a/recipes/quagga/quagga.inc
+++ b/recipes/quagga/quagga.inc
@@ -21,7 +21,7 @@ RDEPENDS_${PN}-watchquagga = "${PN}"
 # the "ip" command from busybox is not sufficient (flush by protocol flushes all routes)
 RDEPENDS_${PN}          += "iproute2"
 
-INC_PR = "r3"
+INC_PR = "r4"
 
 QUAGGASUBDIR = ""
 
diff --git a/recipes/readline/readline_4.3.bb b/recipes/readline/readline_4.3.bb
index 15be6c86d6..6d7902951c 100644
--- a/recipes/readline/readline_4.3.bb
+++ b/recipes/readline/readline_4.3.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${GNU_MIRROR}/readline/readline-${PV}.tar.gz \
 	   file://shlink-termcap.patch \
diff --git a/recipes/readline/readline_5.2.bb b/recipes/readline/readline_5.2.bb
index 845a668297..aadb61958c 100644
--- a/recipes/readline/readline_5.2.bb
+++ b/recipes/readline/readline_5.2.bb
@@ -8,7 +8,7 @@ LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "\
   ftp://ftp.gnu.org/gnu/readline/readline-${PV}.tar.gz \
diff --git a/recipes/readline/readline_6.1.bb b/recipes/readline/readline_6.1.bb
index c9f0c58c24..bc821f8235 100644
--- a/recipes/readline/readline_6.1.bb
+++ b/recipes/readline/readline_6.1.bb
@@ -9,7 +9,7 @@ DEPENDS = "ncurses"
 LEAD_SONAME = "libreadline.so"
 
 PKGV = "${PV}+p2"
-PR = "r1"
+PR = "r2"
 
 # Don't bring it in silently because there was a switch from GPLv2
 # to GPLv3.  It might require newer ncurses 5.7 too which are not
diff --git a/recipes/scli/scli_0.4.0.bb b/recipes/scli/scli_0.4.0.bb
index 3d249106d5..34214816dd 100644
--- a/recipes/scli/scli_0.4.0.bb
+++ b/recipes/scli/scli_0.4.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "SNMP Command Line Interface"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "gsnmp readline libxml2 ncurses"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.ibr.cs.tu-bs.de/pub/local/scli/scli-${PV}.tar.gz"
 
diff --git a/recipes/screen/screen_4.0.2.bb b/recipes/screen/screen_4.0.2.bb
index 69058d938d..bcbd1d41ef 100644
--- a/recipes/screen/screen_4.0.2.bb
+++ b/recipes/screen/screen_4.0.2.bb
@@ -4,7 +4,7 @@ processes, typically interactive shells."
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://screen_4.0.2-4.1sarge1.diff.gz \
diff --git a/recipes/screen/screen_4.0.3.bb b/recipes/screen/screen_4.0.3.bb
index a29ab817c1..44947935fa 100644
--- a/recipes/screen/screen_4.0.3.bb
+++ b/recipes/screen/screen_4.0.3.bb
@@ -4,7 +4,7 @@ processes, typically interactive shells."
 LICENSE = "GPL"
 SECTION = "console/utils"
 DEPENDS = "ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \
            file://cross-compile.patch \
diff --git a/recipes/sl/sl_3.03.bb b/recipes/sl/sl_3.03.bb
index 5fe3ce1515..399e488c02 100644
--- a/recipes/sl/sl_3.03.bb
+++ b/recipes/sl/sl_3.03.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "Corrects you if you type sl by mistake"
 SECTION = "console/games"
 LICENSE = "unknown"
 DEPENDS = "ncurses"
+PR = "r1"
 
 SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03.orig.tar.gz;name=archive \
            http://archive.ubuntu.com/ubuntu/pool/universe/s/sl/sl_3.03-14.diff.gz;name=patch"
diff --git a/recipes/sqlite/sqlite3.inc b/recipes/sqlite/sqlite3.inc
index 191c83c14a..4198f56644 100644
--- a/recipes/sqlite/sqlite3.inc
+++ b/recipes/sqlite/sqlite3.inc
@@ -3,6 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "tcl-native readline ncurses"
 LICENSE = "PD"
+INC_PR = "r1"
 
 SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
 	   file://libtool.patch"
diff --git a/recipes/sqlite/sqlite3_3.6.13.bb b/recipes/sqlite/sqlite3_3.6.13.bb
index 610c1b9163..b636c5fbbf 100644
--- a/recipes/sqlite/sqlite3_3.6.13.bb
+++ b/recipes/sqlite/sqlite3_3.6.13.bb
@@ -1,4 +1,5 @@
 require sqlite3.inc
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "652a01797e7538811e4997a5847bc026"
 SRC_URI[sha256sum] = "2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa"
diff --git a/recipes/sqlite/sqlite3_3.6.20.bb b/recipes/sqlite/sqlite3_3.6.20.bb
index 14fce66cc2..edfc22076d 100644
--- a/recipes/sqlite/sqlite3_3.6.20.bb
+++ b/recipes/sqlite/sqlite3_3.6.20.bb
@@ -1,5 +1,5 @@
 require sqlite3.inc
-
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "0faf8fc8ccff5297513c6532b2b4ce23"
 SRC_URI[sha256sum] = "c172ce97dc7201f38acdff22df467e1514e7225b88c636145e72a66a4ca6d07d"
diff --git a/recipes/sqlite/sqlite3_3.6.23.1.bb b/recipes/sqlite/sqlite3_3.6.23.1.bb
index abc8914ed7..7bed4d40c9 100644
--- a/recipes/sqlite/sqlite3_3.6.23.1.bb
+++ b/recipes/sqlite/sqlite3_3.6.23.1.bb
@@ -1,4 +1,5 @@
 require sqlite3.inc
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "d99f1b31da0eb33271464bee15cec701"
 SRC_URI[sha256sum] = "1a0517438a573a68ab73e8ed75d194086d55d75883542ab1d5ae1080bbddd492"
diff --git a/recipes/sqlite/sqlite_2.8.17.bb b/recipes/sqlite/sqlite_2.8.17.bb
index e6c4fc5773..b83c58374c 100644
--- a/recipes/sqlite/sqlite_2.8.17.bb
+++ b/recipes/sqlite/sqlite_2.8.17.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses"
 LICENSE = "PD"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
        file://mainmk_build_dynamic.patch \
diff --git a/recipes/squidview/squidview_0.72.bb b/recipes/squidview/squidview_0.72.bb
index 017d8cc616..efdbb93ee1 100644
--- a/recipes/squidview/squidview_0.72.bb
+++ b/recipes/squidview/squidview_0.72.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 RDEPENDS_${PN} = "squid"
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/squidview-${PV}"
 
diff --git a/recipes/tasks/task-arago-toolchain-target.bb b/recipes/tasks/task-arago-toolchain-target.bb
index 8f85a894cc..aa592b60c7 100644
--- a/recipes/tasks/task-arago-toolchain-target.bb
+++ b/recipes/tasks/task-arago-toolchain-target.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Target packages for a standalone Arago SDK or external toolchain"
 ALLOW_EMPTY = "1"
-PR = "r2"
+PR = "r3"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/tasks/task-fso-toolchain-target.bb b/recipes/tasks/task-fso-toolchain-target.bb
index d042849bed..0580075b26 100644
--- a/recipes/tasks/task-fso-toolchain-target.bb
+++ b/recipes/tasks/task-fso-toolchain-target.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Packages for a standalone  SDK or external toolchain"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
-PR = "r1"
+PR = "r2"
 
 PACKAGES = "${PN}"
 
diff --git a/recipes/tasks/task-mamona-base.bb b/recipes/tasks/task-mamona-base.bb
index f50c897e3c..fa56e2459a 100644
--- a/recipes/tasks/task-mamona-base.bb
+++ b/recipes/tasks/task-mamona-base.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "task mamona base"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 ALLOW_EMPTY = "1"
 
 PACKAGES = "${PN}"
diff --git a/recipes/tasks/task-proper-tools.bb b/recipes/tasks/task-proper-tools.bb
index 17e74db4e7..e5e4bd6017 100644
--- a/recipes/tasks/task-proper-tools.bb
+++ b/recipes/tasks/task-proper-tools.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Full versions of tools provided by busybox"
-PR = "r13"
+PR = "r14"
 
 inherit task
 
diff --git a/recipes/tasks/task-sdk-base.bb b/recipes/tasks/task-sdk-base.bb
index 99368e03ee..7cf63e8179 100644
--- a/recipes/tasks/task-sdk-base.bb
+++ b/recipes/tasks/task-sdk-base.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic SDK development packages"
-PR = "r5"
+PR = "r6"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
diff --git a/recipes/tcpick/tcpick_0.1.22.bb b/recipes/tcpick/tcpick_0.1.22.bb
index 2c6124106f..353086e275 100644
--- a/recipes/tcpick/tcpick_0.1.22.bb
+++ b/recipes/tcpick/tcpick_0.1.22.bb
@@ -3,6 +3,8 @@ SECTION = "console/network"
 PRIORITY = "required"
 DEPENDS = "ncurses"
 LICENSE = "GPL"
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/tcpick/tcpick-${PV}.tar.gz"
 S = "${WORKDIR}/tcpick-${PV}"
 
diff --git a/recipes/tcptrack/tcptrack_1.1.2.bb b/recipes/tcptrack/tcptrack_1.1.2.bb
index efcdb4bdfa..de9e26ab09 100644
--- a/recipes/tcptrack/tcptrack_1.1.2.bb
+++ b/recipes/tcptrack/tcptrack_1.1.2.bb
@@ -4,7 +4,7 @@ connections on a specified network interface, tracks their states, and lists \
 them in a manner similar to the Unix 'top' command."
 LICENSE = "LGPL"
 DEPENDS = "ncurses libpcap"
-
+PR = "r1"
 SRC_URI = "http://www.rhythm.cx/~steve/devel/tcptrack/release/${PV}/source/tcptrack-${PV}.tar.gz \
 	   file://macros.patch"
 S = "${WORKDIR}/tcptrack-${PV}"
diff --git a/recipes/testdisk/testdisk_6.5+6.6-WIP.bb b/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
index 89a23087a7..cd8ea9296d 100644
--- a/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
+++ b/recipes/testdisk/testdisk_6.5+6.6-WIP.bb
@@ -1,5 +1,6 @@
 DESCRIPTION = "TestDisk is a powerful free data recovery software! It was primarily designed to help recover lost partitions and/or make non-booting disks bootable again when these symptoms are caused by faulty software, certain types of viruses or human error (such as accidentally deleting your Partition Table)."
 LICENSE = "GPLv2"
+PR = "r1"
 
 DEPENDS = "jpeg ncurses e2fsprogs"
 
diff --git a/recipes/texinfo/texinfo_4.13a.bb b/recipes/texinfo/texinfo_4.13a.bb
index 04cb0ddc77..e33537a92e 100644
--- a/recipes/texinfo/texinfo_4.13a.bb
+++ b/recipes/texinfo/texinfo_4.13a.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
 SECTION = "console/utils"
 LICENSE = "GPLv3"
 DEPENDS = "ncurses"
-
+PR = "r1"
 SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
            file://gettext.patch \
           "
diff --git a/recipes/texinfo/texinfo_4.8a.bb b/recipes/texinfo/texinfo_4.8a.bb
index fa3b977073..57a8d561cf 100644
--- a/recipes/texinfo/texinfo_4.8a.bb
+++ b/recipes/texinfo/texinfo_4.8a.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
-
+PR = "r1"
 SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.bz2"
 
 inherit autotools gettext
diff --git a/recipes/tin/tin.inc b/recipes/tin/tin.inc
index 683962838c..026cb8eec9 100644
--- a/recipes/tin/tin.inc
+++ b/recipes/tin/tin.inc
@@ -2,6 +2,7 @@ DESCRIPTION = "Tin is a powerful text mode news reader."
 SECTION = "console/network"
 DEPENDS = "ncurses libpcre"
 LICENSE = "BSD"
+INC_PR = "r2"
 
 inherit autotools 
 
diff --git a/recipes/tin/tin_1.9.1.bb b/recipes/tin/tin_1.9.1.bb
index e38d4bf08b..e01adcdf6d 100644
--- a/recipes/tin/tin_1.9.1.bb
+++ b/recipes/tin/tin_1.9.1.bb
@@ -1,6 +1,6 @@
 require tin.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "ftp://ftp.tin.org/pub/news/clients/tin/v1.9/tin-${PV}.tar.gz \
 	   file://m4.patch"
diff --git a/recipes/tmsnc/tmsnc_0.3.2.bb b/recipes/tmsnc/tmsnc_0.3.2.bb
index 0bf498d325..8821f63bcd 100644
--- a/recipes/tmsnc/tmsnc_0.3.2.bb
+++ b/recipes/tmsnc/tmsnc_0.3.2.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://tmsnc.sf.net"
 SECTION = "console/network"
 LICENSE = "Modified BSD"
 DEPENDS = "ncurses openssl"
-
+PR = "r1"
 SRC_URI = "${SOURCEFORGE_MIRROR}/tmsnc/${P}.tar.gz"
 
 EXTRA_OECONF = "--with-openssl --with-openssl=${STAGING_LIBDIR}/.. --with-includedir=${STAGING_INCDIR}"
diff --git a/recipes/tn5250/tn5250_0.16.5.bb b/recipes/tn5250/tn5250_0.16.5.bb
index 4cab03d7ca..a3ffc884a3 100644
--- a/recipes/tn5250/tn5250_0.16.5.bb
+++ b/recipes/tn5250/tn5250_0.16.5.bb
@@ -4,7 +4,7 @@ to IBM's AS/400 (now known as eServer iSeries) midrange computers."
 HOMEPAGE = "http://tn5250.sourceforge.net/"
 LICENSE = "LGPL"
 DEPENDS = "ncurses openssl"
-PR ="r1"
+PR ="r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/tn5250/tn5250-${PV}.tar.gz \
 	   file://compile.patch"
diff --git a/recipes/uim/uim_1.3.1.bb b/recipes/uim/uim_1.3.1.bb
index c7ad67b56f..a993d0df13 100644
--- a/recipes/uim/uim_1.3.1.bb
+++ b/recipes/uim/uim_1.3.1.bb
@@ -1,7 +1,7 @@
 require uim.inc
 DEPENDS = "gtk+ uim-native anthy fontconfig libxft libxt glib-2.0 ncurses"
 SECTION_uim-gtk2.0 = "x11/inputmethods"
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://uim-module-manager.patch"
 
diff --git a/recipes/uml-utilities/uml-utilities_20040406.bb b/recipes/uml-utilities/uml-utilities_20040406.bb
index 0d26b7a68d..db5ad178a5 100644
--- a/recipes/uml-utilities/uml-utilities_20040406.bb
+++ b/recipes/uml-utilities/uml-utilities_20040406.bb
@@ -2,7 +2,7 @@ SECTION = "console/utils"
 DESCRIPTION = "Utilities for User-Mode-Linux"
 LICENSE = "GPL"
 DEPENDS = "zlib ncurses readline"
-
+PR = "r1"
 SRC_URI = "http://mirror.usermodelinux.org/uml/uml_utilities_${PV}.tar.bz2 \
            file://fix-ldflags.patch"
 SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a"
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 5e1f62f299..cbdf68db39 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -8,7 +8,7 @@ inherit autotools gettext
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r26"
+INC_PR = "r27"
 
 # allows for a release candidate
 RC ?= ""
diff --git a/recipes/util-linux/util-linux.inc b/recipes/util-linux/util-linux.inc
index 01b0ad6698..eef46451d8 100644
--- a/recipes/util-linux/util-linux.inc
+++ b/recipes/util-linux/util-linux.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Util-linux is a suite of essential utilities for any Linux system
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "zlib ncurses"
-
+INC_PR = "r16"
 inherit autotools
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux/util-linux-${PV}.tar.bz2 \
diff --git a/recipes/util-linux/util-linux_2.12.bb b/recipes/util-linux/util-linux_2.12.bb
index 79a5572cc6..ee7a3d6dcc 100644
--- a/recipes/util-linux/util-linux_2.12.bb
+++ b/recipes/util-linux/util-linux_2.12.bb
@@ -1,6 +1,5 @@
-PR = "r5"
-
 require util-linux.inc
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://ftp.cwi.nl/aeb/util-linux/util-linux-${PV}.tar.gz \
            file://MCONFIG \
diff --git a/recipes/util-linux/util-linux_2.12o.bb b/recipes/util-linux/util-linux_2.12o.bb
index 20393717e1..66abb46b27 100644
--- a/recipes/util-linux/util-linux_2.12o.bb
+++ b/recipes/util-linux/util-linux_2.12o.bb
@@ -1,6 +1,5 @@
 require util-linux.inc
-
-PR = "r8"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "a7c0c2729ed27beac39cf656d2097dd3"
 SRC_URI[sha256sum] = "913a83f69a370b6ee858577f8f1d218cfe899fd39d7b8a380df4971b6059e8e0"
diff --git a/recipes/util-linux/util-linux_2.12q.bb b/recipes/util-linux/util-linux_2.12q.bb
index a7f6c1d41b..8ff8e0a454 100644
--- a/recipes/util-linux/util-linux_2.12q.bb
+++ b/recipes/util-linux/util-linux_2.12q.bb
@@ -3,8 +3,7 @@
 ARM_INSTRUCTION_SET = "arm"
 
 require util-linux.inc
-
-PR = "r7"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "54320aa1abbce00c0dc030e2c3afe5d7"
 SRC_URI[sha256sum] = "2e68a53d1393e97926340d9b21e1bde488aaef05ab3e8bcab4849d1859115c6d"
diff --git a/recipes/util-linux/util-linux_2.12r.bb b/recipes/util-linux/util-linux_2.12r.bb
index 0a7f69c636..09ffd5d472 100644
--- a/recipes/util-linux/util-linux_2.12r.bb
+++ b/recipes/util-linux/util-linux_2.12r.bb
@@ -1,4 +1,5 @@
 require util-linux.inc
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://util-linux_2.12r-12.diff.gz"
 SRC_URI += "file://glibc-fix.patch"
@@ -6,7 +7,5 @@ SRC_URI += "file://glibc-umount2.patch"
 SRC_URI += "file://fdiskbsdlabel-avr32.patch" 
 SRC_URI += "file://util-linux-2.12r-cramfs-1.patch" 
 
-PR = "r15"
-
 SRC_URI[md5sum] = "af9d9e03038481fbf79ea3ac33f116f9"
 SRC_URI[sha256sum] = "b8e499b338ce9fbd1fb315194b26540ec823c0afc46c9e145ac7a3e38ad57e6b"
diff --git a/recipes/vim/vim.inc b/recipes/vim/vim.inc
index 054d7d8d77..aa93527ef0 100644
--- a/recipes/vim/vim.inc
+++ b/recipes/vim/vim.inc
@@ -5,7 +5,7 @@ DEPENDS = "ncurses"
 RSUGGESTS_${PN} = "diffutils"
 LICENSE = "vim"
 
-INC_PR = "r6"
+INC_PR = "r7"
 
 SRC_URI = "ftp://ftp.vim.org/pub/vim/unix/vim-${PV}.tar.bz2;name=vim${PV}tarbz2 \
            ftp://ftp.vim.org/pub/vim/extra/vim-${PV}-extra.tar.gz;name=vim${PV}extratargz \
diff --git a/recipes/vte/vte_0.16.14.bb b/recipes/vte/vte_0.16.14.bb
index 854a35a484..23f0a8de57 100644
--- a/recipes/vte/vte_0.16.14.bb
+++ b/recipes/vte/vte_0.16.14.bb
@@ -1,5 +1,5 @@
 require vte.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI[archive.md5sum] = "9df3e35b81b209952ac1cf7904f7b620"
 SRC_URI[archive.sha256sum] = "40cf321980d3139c8f084e818504e1366be81bed817eeeec9021257e04c1c0db"
diff --git a/recipes/vte/vte_0.21.5.bb b/recipes/vte/vte_0.21.5.bb
index eca9740988..a5e3f64f8f 100644
--- a/recipes/vte/vte_0.21.5.bb
+++ b/recipes/vte/vte_0.21.5.bb
@@ -1,6 +1,7 @@
 DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
 DEPENDS += "glib-2.0 gtk+ intltool-native ncurses"
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/vte/vte_0.24.0.bb b/recipes/vte/vte_0.24.0.bb
index 6afc08952d..b6144befda 100644
--- a/recipes/vte/vte_0.24.0.bb
+++ b/recipes/vte/vte_0.24.0.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "vte is a virtual terminal emulator"
 LICENSE = "LGPL"
 DEPENDS += "glib-2.0 gtk+ intltool-native ncurses"
-
+PR = "r1"
 inherit gnome
 
 SRC_URI[archive.md5sum] = "c381f6019448a6e84470ec0acfd78c63"
diff --git a/recipes/xawtv/xawtv_3.93.bb b/recipes/xawtv/xawtv_3.93.bb
index f61a2b427b..39d4af4cb1 100644
--- a/recipes/xawtv/xawtv_3.93.bb
+++ b/recipes/xawtv/xawtv_3.93.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "XawTV is a simple Xaw-based TV program which uses the bttw \
 driver or video4linux.  It also contains various command-line utilities for \
 grabbing images and AVI movies, tuning in TV stations, etc."
 DEPENDS = "libxaw libxmu libxt libxpm libxext virtual/libx11 ncurses libxft fs jpeg"
+PR = "r1"
 
 SRC_URI = "http://dl.bytesex.org/releases/xawtv/xawtv-${PV}.tar.gz \
 	   file://make.patch"
diff --git a/recipes/xorg-app/xterm_207.bb b/recipes/xorg-app/xterm_207.bb
index e1d5e2077b..ac485a7058 100644
--- a/recipes/xorg-app/xterm_207.bb
+++ b/recipes/xorg-app/xterm_207.bb
@@ -1,7 +1,7 @@
 require xorg-app-common.inc
 DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
 DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "${XORG_MIRROR}/development/X11R7.0-RC4/extras/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "3de8a3756c284a46a08c6d0308909486"
diff --git a/recipes/xorg-app/xterm_251.bb b/recipes/xorg-app/xterm_251.bb
index 52c8974ef8..388fbc326e 100644
--- a/recipes/xorg-app/xterm_251.bb
+++ b/recipes/xorg-app/xterm_251.bb
@@ -1,7 +1,7 @@
 require xorg-app-common.inc
 DESCRIPTION = "xterm is the standard terminal emulator for the X Window System."
 DEPENDS = "libxaw xproto xextproto libxext libxau libxpm ncurses"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "ftp://invisible-island.net/xterm/${PN}-${PV}.tgz"
 SRC_URI[md5sum] = "343a4ce213f70c53cf65979f163bebc3"
diff --git a/recipes/zile/zile_1.7+2.0beta6.bb b/recipes/zile/zile_1.7+2.0beta6.bb
index 76c293cfa1..263452543b 100644
--- a/recipes/zile/zile_1.7+2.0beta6.bb
+++ b/recipes/zile/zile_1.7+2.0beta6.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "ncurses"
 PRIORITY = "optional"
 SECTION = "console/editors"
-PR = "r1"
+PR = "r2"
 
 UV = "${@bb.data.getVar('PV', d, 1).split('+')[1]}"
 
diff --git a/recipes/zile/zile_2.2.15.bb b/recipes/zile/zile_2.2.15.bb
index 7fb4c15893..bc7a1286b7 100644
--- a/recipes/zile/zile_2.2.15.bb
+++ b/recipes/zile/zile_2.2.15.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://zile.sourceforge.net/"
 LICENSE = "GPL"
 DEPENDS = "ncurses"
 SECTION = "console/editors"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/zile/zile-${PV}.tar.gz"
 
diff --git a/recipes/zsh/zsh_4.3.10.bb b/recipes/zsh/zsh_4.3.10.bb
index b6ae18d10e..b5f13d6ae2 100644
--- a/recipes/zsh/zsh_4.3.10.bb
+++ b/recipes/zsh/zsh_4.3.10.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "The Zsh shell"
 SECTION = "base/shell"
 PRIORITY = "optional"
 DEPENDS = "ncurses libpcre"
-PR = "r1"
+PR = "r2"
 LICENSE = "zsh"
 
 SRC_URI = "http://www.zsh.org/pub/zsh-${PV}.tar.bz2 \