diff --git a/cobbler/codes.py b/cobbler/codes.py
index 142f137..654d3b3 100644
--- a/cobbler/codes.py
+++ b/cobbler/codes.py
@@ -47,7 +47,7 @@ VALID_OS_VERSIONS = {
     "ubuntu"  : [ "dapper", "hardy", "intrepid", "jaunty" ],
     "generic" : [ "generic24", "generic26", "other" ],
     "windows" : [ "winxp", "win2k", "win2k3", "vista", "other" ],
-    "unix"    : [ "solaris9", "solaris10", "freebsd6", "openbsd4", "other" ],
+    "unix"    : [ "solaris9", "solaris10", "freebsd6", "openbsd4", "netbsd4", "netbsd5", "other" ],
     "other"   : [ "msdos", "netware4", "netware5", "netware6", "generic", "other" ]
 }
 
diff --git a/cobbler/item_image.py b/cobbler/item_image.py
index 3be5d43..24a1044 100644
--- a/cobbler/item_image.py
+++ b/cobbler/item_image.py
@@ -31,28 +31,28 @@ from utils import _
 # this datastructure is described in great detail in item_distro.py -- read the comments there.
 
 FIELDS = [
-  ['name','',0,"Name",True,"",0,"str"],
-  ['arch','i386',0,"Architecture",True,"",["i386","x86_64","ia64","s390","ppc"],"str"],
-  ['breed','redhat',0,"Breed",True,"",codes.VALID_OS_BREEDS,"str"],
-  ['comment','',0,"Comment",True,"Free form text description",0,"str"],
-  ['ctime',0,0,"",False,"",0,"float"],
-  ['mtime',0,0,"",False,"",0,"float"],
-  ['file','',0,"File",True,"Path to local file or nfs://user@host:path",0,"str"],
-  ['depth',0,0,"",False,"",0,"int"],
-  ['image_type',"iso",0,"Image Type",True,"", ["iso","direct","virt-image"],"str"], #FIXME:complete?
-  ['network_count',1,0,"Virt NICs",True,"",0,"int"],
-  ['os_version','',0,"OS Version",True,"ex: rhel4",codes.get_all_os_versions(),"str"],
-  ['owners',"SETTINGS:default_ownership",0,"Owners",True,"Owners list for authz_ownership (space delimited)",[],"list"],
-  ['parent','',0,"",False,"",0,"str"],
-  ['kickstart','',0,"Kickstart",True,"Path to kickstart/answer file template",0,"str"],
-  ['virt_auto_boot',"SETTINGS:virt_auto_boot",0,"Virt Auto Boot",True,"Auto boot this VM?",0,"bool"],
-  ['virt_bridge',"SETTINGS:default_virt_bridge",0,"Virt Bridge",True,"",0,"str"],
-  ['virt_cpus',1,0,"Virt CPUs",True,"",0,"int"],
-  ['virt_file_size',"SETTINGS:default_virt_file_size",0,"Virt File Size (GB)",True,"",0,"float"],
-  ['virt_path','',0,"Virt Path",True,"Ex: /directory or VolGroup00",0,"str"],
-  ['virt_ram',"SETTINGS:default_virt_ram",0,"Virt RAM (MB)",True,"",0,"int"],
-  ['virt_type',"SETTINGS:default_virt_type",0,"Virt Type",True,"",["xenpv","xenfv","qemu","vmware"],"str"],
-  ['uid',"",0,"",False,"",0,"str"]
+   [ "name","",0,"Name",True,"Ex: Fedora-11-live-i386",0,"str"],
+   ["ctime",0,0,"",False,"",0,"float"],
+   ["mtime",0,0,"",False,"",0,"float"],
+   [ "uid","",0,"",False,"",0,"str"],
+   [ "owners","SETTINGS:default_ownership",0,"Owners",True,"Owners list for authz_ownership (space delimited)",[],"list"],
+   [ "file","",0,"File",True,"Path to local file or nfs://user@host:path",0,"str"],
+   [ "image_type","iso",0,"Image Type",True,"", ["iso","direct","virt-image"],"str"], #FIXME:complete?
+   [ "kickstart","",0,"Kickstart",True,"Path to kickstart/answer file template",0,"str"],
+   [ "arch","i386",0,"Architecture",True,"",["i386","x86_64","ia64","s390","ppc"],"str"],
+   [ "breed","redhat",0,"Breed",True,"",codes.VALID_OS_BREEDS,"str"],
+   [ "os_version","",0,"OS Version",True,"ex: rhel4",codes.get_all_os_versions(),"str"],
+   [ "depth",0,0,"",False,"",0,"int"],
+   [ "comment","",0,"Comment",True,"Free form text description",0,"str"],
+   [ "parent","",0,"",False,"",0,"str"],
+   [ "network_count",1,0,"Virt NICs",True,"",0,"int"],
+   [ "virt_auto_boot","SETTINGS:virt_auto_boot",0,"Virt Auto Boot",True,"Auto boot this VM?",0,"bool"],
+   [ "virt_bridge","SETTINGS:default_virt_bridge",0,"Virt Bridge",True,"",0,"str"],
+   [ "virt_cpus",1,0,"Virt CPUs",True,"",0,"int"],
+   [ "virt_file_size","SETTINGS:default_virt_file_size",0,"Virt File Size (GB)",True,"",0,"float"],
+   [ "virt_path","",0,"Virt Path",True,"Ex: /directory or VolGroup00",0,"str"],
+   [ "virt_ram","SETTINGS:default_virt_ram",0,"Virt RAM (MB)",True,"",0,"int"],
+   [ "virt_type","SETTINGS:default_virt_type",0,"Virt Type",True,"",["xenpv","xenfv","qemu","vmware"],"str"]
 ]
 
 class Image(item.Item):