diff --git a/tools/python/xen/xend/arch.py b/tools/python/xen/xend/arch.py
index a556c0e6cf..4ea19e899c 100644
--- a/tools/python/xen/xend/arch.py
+++ b/tools/python/xen/xend/arch.py
@@ -25,6 +25,7 @@ _types = {
     "i586": "x86",
     "i686": "x86",
     "x86_64": "x86",
+    "amd64": "x86",
     "i86pc": "x86",
     "ia64": "ia64",
     "ppc": "powerpc",
diff --git a/tools/python/xen/xend/osdep.py b/tools/python/xen/xend/osdep.py
index 93b2dfdb4e..6d2f81dae8 100644
--- a/tools/python/xen/xend/osdep.py
+++ b/tools/python/xen/xend/osdep.py
@@ -25,6 +25,7 @@ _scripts_dir = {
 }
 
 _xend_autorestart = {
+    "NetBSD": True,
     "Linux": True,
     "SunOS": False,
 }