diff --git a/meta/classes/gnome.bbclass b/meta/classes/gnome.bbclass
index 25d1778851..0d39816cdd 100644
--- a/meta/classes/gnome.bbclass
+++ b/meta/classes/gnome.bbclass
@@ -11,10 +11,6 @@ DEPENDS += "gnome-common"
 FILES_${PN} += "${datadir}/application-registry ${datadir}/mime-info \
 	${datadir}/gnome-2.0"
 
-inherit autotools pkgconfig gconf
+inherit autotools_stage pkgconfig gconf
 
 EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
-
-gnome_stage_includes() {
-	autotools_stage_includes
-}
diff --git a/meta/packages/gnome/gnome-icon-theme_2.22.0.bb b/meta/packages/gnome/gnome-icon-theme_2.22.0.bb
index d5e7f29b69..f78e6a6e5b 100644
--- a/meta/packages/gnome/gnome-icon-theme_2.22.0.bb
+++ b/meta/packages/gnome/gnome-icon-theme_2.22.0.bb
@@ -3,6 +3,7 @@ SECTION = "x11/gnome"
 DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
 RDEPENDS = "hicolor-icon-theme"
 RRECOMMENDS = "librsvg-gtk"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/*"