diff --git a/usr.bin/dtc/dtc.cc b/usr.bin/dtc/dtc.cc
index 5ba5cb9a3b7a..e111dd5c6802 100644
--- a/usr.bin/dtc/dtc.cc
+++ b/usr.bin/dtc/dtc.cc
@@ -51,14 +51,17 @@ using std::string;
  * The current major version of the tool.
  */
 int version_major = 0;
+int version_major_compatible = 1;
 /**
  * The current minor version of the tool.
  */
 int version_minor = 5;
+int version_minor_compatible = 4;
 /**
  * The current patch level of the tool.
  */
 int version_patch = 0;
+int version_patch_compatible = 0;
 
 static void usage(const string &argv0)
 {
@@ -77,8 +80,10 @@ static void usage(const string &argv0)
  */
 static void version(const char* progname)
 {
-	fprintf(stderr, "Version: %s %d.%d.%d\n", progname, version_major,
-			version_minor, version_patch);
+	fprintf(stdout, "Version: %s %d.%d.%d compatible with gpl dtc %d.%d.%d\n", progname,
+		version_major, version_minor, version_patch,
+		version_major_compatible, version_minor_compatible,
+		version_patch_compatible);
 }
 
 using fdt::device_tree;
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index 222d3e02b8a8..d0af31479617 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -1224,9 +1224,9 @@ device_tree::resolve_cross_references()
 				{
 					pv->byte_data.push_back('@');
 					push_string(pv->byte_data, p->second);
-					pv->byte_data.push_back(0);
 				}
 			}
+			pv->byte_data.push_back(0);
 		}
 	}
 	std::unordered_map<property_value*, fixup&> phandle_set;