diff --git a/v2/util/print.jam b/v2/util/print.jam
index 9db214ed0..708d21aba 100644
--- a/v2/util/print.jam
+++ b/v2/util/print.jam
@@ -423,7 +423,7 @@ rule check-for-update ( target )
     local scanner = [ get-scanner ] ;
     local file = [ path.native [ modules.binding $(__name__) ] ] ;
     local g = [ MATCH <(.*)> : $(target:G) ] ;
-    local dependency-target = $(__file__:G=$(g)-$(target:G=)-$(scanner)) ;
+    local dependency-target = $(__file__:G=$(g:E=)-$(target:G=)-$(scanner)) ;
     DEPENDS $(target) : $(dependency-target) ;
     SEARCH on $(dependency-target) = $(file:D) ;
     ISFILE $(dependency-target) ;
@@ -449,7 +449,11 @@ class print-scanner : scanner
         local base = [ on $(target) return $(base) ] ;
         local nl = [ on $(base) return $(nl) ] ;
         local text-content = [ on $(base) return $(text-content) ] ;
-        local dir = [ path.make [ on $(base) return $(LOCATE) ] ] ;
+        local dir = [ on $(base) return $(LOCATE) ] ;
+        if $(dir)
+        {
+            dir = [ path.make $(dir) ] ;
+        }
         local file = [ path.native [ path.join $(dir) $(base:G=) ] ] ;
         local actual-content ;
         if [ os.name ] = NT