diff --git a/pmb/aportgen/device.py b/pmb/aportgen/device.py
index 6eda29e7..ad72f8d9 100644
--- a/pmb/aportgen/device.py
+++ b/pmb/aportgen/device.py
@@ -127,6 +127,7 @@ def generate_deviceinfo_fastboot_content(args, bootimg=None):
 
 def generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
                         has_external_storage, flash_method, bootimg=None):
+    codename = "-".join(pkgname.split("-")[1:])
     # Note: New variables must be added to pmb/config/__init__.py as well
     content = """\
         # Reference: <https://postmarketos.org/deviceinfo>
@@ -135,6 +136,7 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, arch, has_keyboard,
         deviceinfo_format_version="0"
         deviceinfo_name=\"""" + name + """\"
         deviceinfo_manufacturer=\"""" + manufacturer + """\"
+        deviceinfo_codename=\"""" + codename + """\"
         deviceinfo_date=""
         deviceinfo_dtb=""
         deviceinfo_modules_initfs=""
diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py
index 91d0febc..67389fa4 100644
--- a/pmb/config/__init__.py
+++ b/pmb/config/__init__.py
@@ -225,6 +225,7 @@ deviceinfo_attributes = [
     "format_version",
     "name",
     "manufacturer",
+    "codename",
     "date",
     "dtb",
     "modules_initfs",
diff --git a/pmb/parse/deviceinfo.py b/pmb/parse/deviceinfo.py
index 19190dc0..48be4a7e 100644
--- a/pmb/parse/deviceinfo.py
+++ b/pmb/parse/deviceinfo.py
@@ -42,6 +42,12 @@ def sanity_check(info, path):
                            " delete the deviceinfo_msm_refresher line in: " +
                            path)
 
+    # "codename" is required
+    codename = os.path.basename(os.path.dirname(path)).replace("device-", "")
+    if "codename" not in info or info["codename"] != codename:
+        raise RuntimeError("Please add 'deviceinfo_codename=\"" + codename +
+                           "\"' to: " + path)
+
 
 def deviceinfo(args, device=None):
     """