diff --git a/Changes b/Changes
index ba021972..3a7dd0d4 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,18 @@
+2.060000 - 2022-12-09
+
+  [NEW FEATURES]
+
+  * #945 custom fields on devices and ports in the web from config
+
+  [ENHANCEMENTS]
+
+  * #943 search fields HTML5 type "search" to allow clearing
+
+  [BUG FIXES]
+
+  * #944 DevicePort.pm should use vlan_entry instead of vlan
+  * avoid pulling port_properties rows if with_properties already called
+
 2.059001 - 2022-11-26
 
   [ENHANCEMENTS]
diff --git a/MANIFEST b/MANIFEST
index 39e88b23..2daa15a7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -149,6 +149,7 @@ lib/App/Netdisco/Web/AdminTask.pm
 lib/App/Netdisco/Web/API/Objects.pm
 lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
 lib/App/Netdisco/Web/AuthN.pm
+lib/App/Netdisco/Web/CustomFields.pm
 lib/App/Netdisco/Web/Device.pm
 lib/App/Netdisco/Web/GenericReport.pm
 lib/App/Netdisco/Web/Password.pm
@@ -475,6 +476,7 @@ share/schema_versions/App-Netdisco-DB-72-73-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-73-74-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-74-75-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-75-76-PostgreSQL.sql
+share/schema_versions/App-Netdisco-DB-76-77-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql
 share/views/admintask.tt
diff --git a/META.json b/META.json
index 8a7cfdb1..101fe264 100644
--- a/META.json
+++ b/META.json
@@ -136,7 +136,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.059001"
+         "version" : "2.060000"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -158,7 +158,7 @@
       },
       "App::Netdisco::DB" : {
          "file" : "lib/App/Netdisco/DB.pm",
-         "version" : "76"
+         "version" : "77"
       },
       "App::Netdisco::DB::ExplicitLocking" : {
          "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
@@ -544,6 +544,9 @@
       "App::Netdisco::Web::AuthN" : {
          "file" : "lib/App/Netdisco/Web/AuthN.pm"
       },
+      "App::Netdisco::Web::CustomFields" : {
+         "file" : "lib/App/Netdisco/Web/CustomFields.pm"
+      },
       "App::Netdisco::Web::Device" : {
          "file" : "lib/App/Netdisco/Web/Device.pm"
       },
@@ -920,6 +923,6 @@
       "x_IRC" : "irc://irc.libera.chat/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.059001",
+   "version" : "2.060000",
    "x_serialization_backend" : "JSON::PP version 4.06"
 }
diff --git a/META.yml b/META.yml
index bc000b7e..82d334e0 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.059001'
+    version: '2.060000'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -38,7 +38,7 @@ provides:
     file: lib/App/Netdisco/Configuration.pm
   App::Netdisco::DB:
     file: lib/App/Netdisco/DB.pm
-    version: '76'
+    version: '77'
   App::Netdisco::DB::ExplicitLocking:
     file: lib/App/Netdisco/DB/ExplicitLocking.pm
   App::Netdisco::DB::Result:
@@ -295,6 +295,8 @@ provides:
     file: lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
   App::Netdisco::Web::AuthN:
     file: lib/App/Netdisco/Web/AuthN.pm
+  App::Netdisco::Web::CustomFields:
+    file: lib/App/Netdisco/Web/CustomFields.pm
   App::Netdisco::Web::Device:
     file: lib/App/Netdisco/Web/Device.pm
   App::Netdisco::Web::GenericReport:
@@ -635,5 +637,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: https://github.com/netdisco/netdisco
-version: '2.059001'
+version: '2.060000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index 4c59b02a..b9052527 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.059001';
+our $VERSION = '2.060000';
 use App::Netdisco::Configuration;
 
 =head1 NAME