diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 1bf35b15a6..e4d7c1de91 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -65,3 +65,5 @@ CONNECTIVITY_CHECK_URIS ?= "git://git.yoctoproject.org/yocto-firewall-test;proto
                           https://eula-downloads.yoctoproject.org/index.php \
                           http://bugzilla.yoctoproject.org/report.cgi"
 
+# Default hash policy for distro
+BB_SIGNATURE_HANDLER ?= 'OEBasicHash'
diff --git a/meta-yocto/conf/local.conf.sample.extended b/meta-yocto/conf/local.conf.sample.extended
index f0d1ba85f8..4ea2a6a19f 100644
--- a/meta-yocto/conf/local.conf.sample.extended
+++ b/meta-yocto/conf/local.conf.sample.extended
@@ -115,8 +115,12 @@
 #DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
 
 # The network based PR service host and port
+# Uncomment the following lines to enable PRservice.
+# Set PRSERV_HOST to 'localhost' and PRSERV_PORT to '0' to automatically
+# start local PRService.
+# Set to other values to use remote PRService.
 #PRSERV_HOST = "localhost"
-#PRSERV_PORT = "8585"
+#PRSERV_PORT = "0"
 
 # Additional image generation features
 #