diff --git a/update/.editorconfig b/update/.editorconfig
deleted file mode 100644
index 1b51cad..0000000
--- a/update/.editorconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[*]
-charset=utf-8
-end_of_line=lf
-insert_final_newline=false
-indent_style=tab
-tab_width=4
-
-[{phpunit.xml.dist,*.jhm,*.xslt,*.xul,*.rng,*.xsl,*.xsd,*.ant,*.tld,*.fxml,*.jrxml,*.xml,*.jnlp,*.wsdl}]
-indent_style=space
-indent_size=4
-
-[*.svg]
-indent_style=space
-indent_size=4
-
diff --git a/update/.gitattributes b/update/.gitattributes
deleted file mode 100644
index ba74e78..0000000
--- a/update/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/build export-ignore
diff --git a/update/.gitignore b/update/.gitignore
deleted file mode 100644
index 7126070..0000000
--- a/update/.gitignore
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by .ignore support plugin (hsz.mobi)
-### JetBrains template
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# The entire IDEA/PhpStorm directory
-.idea/
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
diff --git a/update/Puc/v5/PucFactory.php b/update/Puc/v5/PucFactory.php
index a2ec2d2..0bc62ce 100644
--- a/update/Puc/v5/PucFactory.php
+++ b/update/Puc/v5/PucFactory.php
@@ -4,7 +4,7 @@
 
 if ( !class_exists(PucFactory::class, false) ):
 
-	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p3\PucFactory {
+	class PucFactory extends \YahnisElsts\PluginUpdateChecker\v5p4\PucFactory {
 	}
 
 endif;
diff --git a/update/Puc/v5p3/Autoloader.php b/update/Puc/v5p4/Autoloader.php
similarity index 98%
rename from update/Puc/v5p3/Autoloader.php
rename to update/Puc/v5p4/Autoloader.php
index 5074ab2..5a98133 100644
--- a/update/Puc/v5p3/Autoloader.php
+++ b/update/Puc/v5p4/Autoloader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(Autoloader::class, false) ):
 
diff --git a/update/Puc/v5p3/DebugBar/Extension.php b/update/Puc/v5p4/DebugBar/Extension.php
similarity index 97%
rename from update/Puc/v5p3/DebugBar/Extension.php
rename to update/Puc/v5p4/DebugBar/Extension.php
index df4a493..0adb68c 100644
--- a/update/Puc/v5p3/DebugBar/Extension.php
+++ b/update/Puc/v5p4/DebugBar/Extension.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\PucFactory;
-use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker;
 
 if ( !class_exists(Extension::class, false) ):
 
diff --git a/update/Puc/v5p3/DebugBar/Panel.php b/update/Puc/v5p4/DebugBar/Panel.php
similarity index 97%
rename from update/Puc/v5p3/DebugBar/Panel.php
rename to update/Puc/v5p4/DebugBar/Panel.php
index 795525c..b846277 100644
--- a/update/Puc/v5p3/DebugBar/Panel.php
+++ b/update/Puc/v5p4/DebugBar/Panel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker;
 
 if ( !class_exists(Panel::class, false) && class_exists('Debug_Bar_Panel', false) ):
 
diff --git a/update/Puc/v5p3/DebugBar/PluginExtension.php b/update/Puc/v5p4/DebugBar/PluginExtension.php
similarity index 90%
rename from update/Puc/v5p3/DebugBar/PluginExtension.php
rename to update/Puc/v5p4/DebugBar/PluginExtension.php
index b5546c7..b30f3ee 100644
--- a/update/Puc/v5p3/DebugBar/PluginExtension.php
+++ b/update/Puc/v5p4/DebugBar/PluginExtension.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginExtension::class, false) ):
 
diff --git a/update/Puc/v5p3/DebugBar/PluginPanel.php b/update/Puc/v5p4/DebugBar/PluginPanel.php
similarity index 87%
rename from update/Puc/v5p3/DebugBar/PluginPanel.php
rename to update/Puc/v5p4/DebugBar/PluginPanel.php
index d7e418d..4c1d230 100644
--- a/update/Puc/v5p3/DebugBar/PluginPanel.php
+++ b/update/Puc/v5p4/DebugBar/PluginPanel.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Plugin\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\Plugin\UpdateChecker;
 
 if ( !class_exists(PluginPanel::class, false) ):
 
diff --git a/update/Puc/v5p3/DebugBar/ThemePanel.php b/update/Puc/v5p4/DebugBar/ThemePanel.php
similarity index 79%
rename from update/Puc/v5p3/DebugBar/ThemePanel.php
rename to update/Puc/v5p4/DebugBar/ThemePanel.php
index 3183ead..7b9d99a 100644
--- a/update/Puc/v5p3/DebugBar/ThemePanel.php
+++ b/update/Puc/v5p4/DebugBar/ThemePanel.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Theme\UpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\Theme\UpdateChecker;
 
 if ( !class_exists(ThemePanel::class, false) ):
 
diff --git a/update/Puc/v5p3/InstalledPackage.php b/update/Puc/v5p4/InstalledPackage.php
similarity index 98%
rename from update/Puc/v5p3/InstalledPackage.php
rename to update/Puc/v5p4/InstalledPackage.php
index 06a5d21..341e7a3 100644
--- a/update/Puc/v5p3/InstalledPackage.php
+++ b/update/Puc/v5p4/InstalledPackage.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(InstalledPackage::class, false) ):
 
diff --git a/update/Puc/v5p3/Metadata.php b/update/Puc/v5p4/Metadata.php
similarity index 98%
rename from update/Puc/v5p3/Metadata.php
rename to update/Puc/v5p4/Metadata.php
index f368f88..2d93d8e 100644
--- a/update/Puc/v5p3/Metadata.php
+++ b/update/Puc/v5p4/Metadata.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 use LogicException;
 use stdClass;
diff --git a/update/Puc/v5p3/OAuthSignature.php b/update/Puc/v5p4/OAuthSignature.php
similarity index 98%
rename from update/Puc/v5p3/OAuthSignature.php
rename to update/Puc/v5p4/OAuthSignature.php
index be9ad9e..ccb62b4 100644
--- a/update/Puc/v5p3/OAuthSignature.php
+++ b/update/Puc/v5p4/OAuthSignature.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(OAuthSignature::class, false) ):
 
diff --git a/update/Puc/v5p3/Plugin/Package.php b/update/Puc/v5p4/Plugin/Package.php
similarity index 96%
rename from update/Puc/v5p3/Plugin/Package.php
rename to update/Puc/v5p4/Plugin/Package.php
index 6b19bb3..30deaee 100644
--- a/update/Puc/v5p3/Plugin/Package.php
+++ b/update/Puc/v5p4/Plugin/Package.php
@@ -1,8 +1,8 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p3\PucFactory;
+use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p4\PucFactory;
 
 if ( !class_exists(Package::class, false) ):
 
diff --git a/update/Puc/v5p3/Plugin/PluginInfo.php b/update/Puc/v5p4/Plugin/PluginInfo.php
similarity index 97%
rename from update/Puc/v5p3/Plugin/PluginInfo.php
rename to update/Puc/v5p4/Plugin/PluginInfo.php
index 69978a6..2428488 100644
--- a/update/Puc/v5p3/Plugin/PluginInfo.php
+++ b/update/Puc/v5p4/Plugin/PluginInfo.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Metadata;
+use YahnisElsts\PluginUpdateChecker\v5p4\Metadata;
 
 if ( !class_exists(PluginInfo::class, false) ):
 
diff --git a/update/Puc/v5p3/Plugin/Ui.php b/update/Puc/v5p4/Plugin/Ui.php
similarity index 99%
rename from update/Puc/v5p3/Plugin/Ui.php
rename to update/Puc/v5p4/Plugin/Ui.php
index d300a5e..a9cdbda 100644
--- a/update/Puc/v5p3/Plugin/Ui.php
+++ b/update/Puc/v5p4/Plugin/Ui.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
-if ( !class_exists('Ui', false) ):
+if ( !class_exists(Ui::class, false) ):
 	/**
 	 * Additional UI elements for plugins.
 	 */
diff --git a/update/Puc/v5p3/Plugin/Update.php b/update/Puc/v5p4/Plugin/Update.php
similarity index 96%
rename from update/Puc/v5p3/Plugin/Update.php
rename to update/Puc/v5p4/Plugin/Update.php
index cec09cf..0fb3137 100644
--- a/update/Puc/v5p3/Plugin/Update.php
+++ b/update/Puc/v5p4/Plugin/Update.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Update as BaseUpdate;
+use YahnisElsts\PluginUpdateChecker\v5p4\Update as BaseUpdate;
 
 if ( !class_exists(Update::class, false) ):
 
diff --git a/update/Puc/v5p3/Plugin/UpdateChecker.php b/update/Puc/v5p4/Plugin/UpdateChecker.php
similarity index 97%
rename from update/Puc/v5p3/Plugin/UpdateChecker.php
rename to update/Puc/v5p4/Plugin/UpdateChecker.php
index 2f07fa3..6d1aae8 100644
--- a/update/Puc/v5p3/Plugin/UpdateChecker.php
+++ b/update/Puc/v5p4/Plugin/UpdateChecker.php
@@ -1,10 +1,10 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker as BaseUpdateChecker;
-use YahnisElsts\PluginUpdateChecker\v5p3\Scheduler;
-use YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker as BaseUpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\Scheduler;
+use YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
 if ( !class_exists(UpdateChecker::class, false) ):
 
@@ -17,7 +17,7 @@
 	 */
 	class UpdateChecker extends BaseUpdateChecker {
 		protected $updateTransient = 'update_plugins';
-		protected $translationType = 'plugin';
+		protected $componentType = 'plugin';
 
 		public $pluginAbsolutePath = ''; //Full path of the main plugin file.
 		public $pluginFile = '';  //Plugin filename relative to the plugins directory. Many WP APIs use this to identify plugins.
diff --git a/update/Puc/v5p3/PucFactory.php b/update/Puc/v5p4/PucFactory.php
similarity index 97%
rename from update/Puc/v5p3/PucFactory.php
rename to update/Puc/v5p4/PucFactory.php
index 2063277..b7cbbb1 100644
--- a/update/Puc/v5p3/PucFactory.php
+++ b/update/Puc/v5p4/PucFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
-use YahnisElsts\PluginUpdateChecker\v5p3\Theme;
-use YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+use YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
+use YahnisElsts\PluginUpdateChecker\v5p4\Theme;
+use YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !class_exists(PucFactory::class, false) ):
 
@@ -147,7 +147,7 @@ public static function buildUpdateChecker($metadataUrl, $fullPath, $slug = '', $
 		 *
 		 * Normalize a filesystem path. Introduced in WP 3.9.
 		 * Copying here allows use of the class on earlier versions.
-		 * This version adapted from WP 4.8.2 (unchanged since 4.5.3)
+		 * This version adapted from WP 4.8.2 (unchanged since 4.5.4)
 		 *
 		 * @param string $path Path to normalize.
 		 * @return string Normalized path.
diff --git a/update/Puc/v5p3/Scheduler.php b/update/Puc/v5p4/Scheduler.php
similarity index 91%
rename from update/Puc/v5p3/Scheduler.php
rename to update/Puc/v5p4/Scheduler.php
index 98f2e93..e4bc3d0 100644
--- a/update/Puc/v5p3/Scheduler.php
+++ b/update/Puc/v5p4/Scheduler.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(Scheduler::class, false) ):
 
@@ -87,6 +87,7 @@ public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('
 					add_action($hook, array($this, 'maybeCheckForUpdates'));
 				}
 				//This hook fires after a bulk update is complete.
+				add_action('upgrader_process_complete', array($this, 'removeHooksIfLibraryGone'), 1, 0);
 				add_action('upgrader_process_complete', array($this, 'upgraderProcessComplete'), 11, 2);
 
 			} else {
@@ -95,6 +96,22 @@ public function __construct($updateChecker, $checkPeriod, $hourlyHooks = array('
 			}
 		}
 
+		/**
+		 * Remove all hooks if this version of PUC has been deleted or overwritten.
+		 *
+		 * Callback for the "upgrader_process_complete" action.
+		 */
+		public function removeHooksIfLibraryGone() {
+			//Cancel all further actions if the current version of PUC has been deleted or overwritten
+			//by a different version during the upgrade. If we try to do anything more in that situation,
+			//we could trigger a fatal error by trying to autoload a deleted class.
+			clearstatcache();
+			if ( !file_exists(__FILE__) ) {
+				$this->removeHooks();
+				$this->updateChecker->removeHooks();
+			}
+		}
+
 		/**
 		 * Runs upon the WP action upgrader_process_complete.
 		 *
@@ -108,16 +125,6 @@ public function upgraderProcessComplete(
 			/** @noinspection PhpUnusedParameterInspection */
 			$upgrader, $upgradeInfo
 		) {
-			//Cancel all further actions if the current version of PUC has been deleted or overwritten
-			//by a different version during the upgrade. If we try to do anything more in that situation,
-			//we could trigger a fatal error by trying to autoload a deleted class.
-			clearstatcache();
-			if ( !file_exists(__FILE__) ) {
-				$this->removeHooks();
-				$this->updateChecker->removeHooks();
-				return;
-			}
-
 			//Sanity check and limitation to relevant types.
 			if (
 				!is_array($upgradeInfo) || !isset($upgradeInfo['type'], $upgradeInfo['action'])
@@ -180,6 +187,21 @@ public function maybeCheckForUpdates() {
 			$state = $this->updateChecker->getUpdateState();
 			$shouldCheck = ($state->timeSinceLastCheck() >= $this->getEffectiveCheckPeriod());
 
+			if ( $shouldCheck ) {
+				//Sanity check: Do not proceed if one of the critical classes is missing.
+				//That can happen - theoretically and extremely rarely - if maybeCheckForUpdates()
+				//is called before the old version of our plugin has been fully deleted, or
+				//called from an independent AJAX request during deletion.
+				if ( !(
+					class_exists(Utils::class)
+					&& class_exists(Metadata::class)
+					&& class_exists(Plugin\Update::class)
+					&& class_exists(Theme\Update::class)
+				) ) {
+					return;
+				}
+			}
+
 			//Let plugin authors substitute their own algorithm.
 			$shouldCheck = apply_filters(
 				$this->updateChecker->getUniqueName('check_now'),
diff --git a/update/Puc/v5p3/StateStore.php b/update/Puc/v5p4/StateStore.php
similarity index 93%
rename from update/Puc/v5p3/StateStore.php
rename to update/Puc/v5p4/StateStore.php
index f182787..3828c1c 100644
--- a/update/Puc/v5p3/StateStore.php
+++ b/update/Puc/v5p4/StateStore.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(StateStore::class, false) ):
 
@@ -163,7 +163,12 @@ protected function load() {
 
 			$state = get_site_option($this->optionName, null);
 
-			if ( !is_object($state) ) {
+			if (
+				!is_object($state)
+				//Sanity check: If the Utils class is missing, the plugin is probably in the process
+				//of being deleted (e.g. the old version gets deleted during an update).
+				|| !class_exists(Utils::class)
+			) {
 				$this->lastCheck = 0;
 				$this->checkedVersion = '';
 				$this->update = null;
diff --git a/update/Puc/v5p3/Theme/Package.php b/update/Puc/v5p4/Theme/Package.php
similarity index 93%
rename from update/Puc/v5p3/Theme/Package.php
rename to update/Puc/v5p4/Theme/Package.php
index 8a83f66..0b20702 100644
--- a/update/Puc/v5p3/Theme/Package.php
+++ b/update/Puc/v5p4/Theme/Package.php
@@ -1,7 +1,7 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Theme;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Theme;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
 
 if ( !class_exists(Package::class, false) ):
 
diff --git a/update/Puc/v5p3/Theme/Update.php b/update/Puc/v5p4/Theme/Update.php
similarity index 94%
rename from update/Puc/v5p3/Theme/Update.php
rename to update/Puc/v5p4/Theme/Update.php
index 3c9dc9e..0a69fd6 100644
--- a/update/Puc/v5p3/Theme/Update.php
+++ b/update/Puc/v5p4/Theme/Update.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Theme;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Theme;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Update as BaseUpdate;
+use YahnisElsts\PluginUpdateChecker\v5p4\Update as BaseUpdate;
 
 if ( !class_exists(Update::class, false) ):
 
diff --git a/update/Puc/v5p3/Theme/UpdateChecker.php b/update/Puc/v5p4/Theme/UpdateChecker.php
similarity index 93%
rename from update/Puc/v5p3/Theme/UpdateChecker.php
rename to update/Puc/v5p4/Theme/UpdateChecker.php
index 92f960f..80481e6 100644
--- a/update/Puc/v5p3/Theme/UpdateChecker.php
+++ b/update/Puc/v5p4/Theme/UpdateChecker.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Theme;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Theme;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\UpdateChecker as BaseUpdateChecker;
-use YahnisElsts\PluginUpdateChecker\v5p3\InstalledPackage;
-use YahnisElsts\PluginUpdateChecker\v5p3\Scheduler;
-use YahnisElsts\PluginUpdateChecker\v5p3\DebugBar;
+use YahnisElsts\PluginUpdateChecker\v5p4\UpdateChecker as BaseUpdateChecker;
+use YahnisElsts\PluginUpdateChecker\v5p4\InstalledPackage;
+use YahnisElsts\PluginUpdateChecker\v5p4\Scheduler;
+use YahnisElsts\PluginUpdateChecker\v5p4\DebugBar;
 
 if ( !class_exists(UpdateChecker::class, false) ):
 
 	class UpdateChecker extends BaseUpdateChecker {
 		protected $filterSuffix = 'theme';
 		protected $updateTransient = 'update_themes';
-		protected $translationType = 'theme';
+		protected $componentType = 'theme';
 
 		/**
 		 * @var string Theme directory name.
diff --git a/update/Puc/v5p3/Update.php b/update/Puc/v5p4/Update.php
similarity index 93%
rename from update/Puc/v5p3/Update.php
rename to update/Puc/v5p4/Update.php
index 994e54d..6c58510 100644
--- a/update/Puc/v5p3/Update.php
+++ b/update/Puc/v5p4/Update.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 use stdClass;
 
diff --git a/update/Puc/v5p3/UpdateChecker.php b/update/Puc/v5p4/UpdateChecker.php
similarity index 97%
rename from update/Puc/v5p3/UpdateChecker.php
rename to update/Puc/v5p4/UpdateChecker.php
index c14be03..8833547 100644
--- a/update/Puc/v5p3/UpdateChecker.php
+++ b/update/Puc/v5p4/UpdateChecker.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 use stdClass;
 use WP_Error;
@@ -9,7 +9,16 @@
 	abstract class UpdateChecker {
 		protected $filterSuffix = '';
 		protected $updateTransient = '';
-		protected $translationType = ''; //This can be "plugin" or "theme".
+
+		/**
+		 * @var string This can be "plugin" or "theme".
+		 */
+		protected $componentType = '';
+		/**
+		 * @var string Currently the same as $componentType, but this is an implementation detail that
+		 *             depends on how WP works internally, and could therefore change.
+		 */
+		protected $translationType = '';
 
 		/**
 		 * Set to TRUE to enable error reporting. Errors are raised using trigger_error()
@@ -74,6 +83,11 @@ abstract class UpdateChecker {
 		 */
 		protected $debugBarExtension = null;
 
+		/**
+		 * @var WpCliCheckTrigger|null
+		 */
+		protected $wpCliCheckTrigger = null;
+
 		public function __construct($metadataUrl, $directoryName, $slug = null, $checkPeriod = 12, $optionName = '') {
 			$this->debugMode = (bool)(constant('WP_DEBUG'));
 			$this->metadataUrl = $metadataUrl;
@@ -91,6 +105,10 @@ public function __construct($metadataUrl, $directoryName, $slug = null, $checkPe
 				}
 			}
 
+			if ( empty($this->translationType) ) {
+				$this->translationType = $this->componentType;
+			}
+
 			$this->package = $this->createInstalledPackage();
 			$this->scheduler = $this->createScheduler($checkPeriod);
 			$this->upgraderStatus = new UpgraderStatus();
@@ -103,6 +121,10 @@ public function __construct($metadataUrl, $directoryName, $slug = null, $checkPe
 			}
 
 			$this->installHooks();
+
+			if ( ($this->wpCliCheckTrigger === null) && defined('WP_CLI') ) {
+				$this->wpCliCheckTrigger = new WpCliCheckTrigger($this->componentType, $this->scheduler);
+			}
 		}
 
 		/**
diff --git a/update/Puc/v5p3/UpgraderStatus.php b/update/Puc/v5p4/UpgraderStatus.php
similarity index 99%
rename from update/Puc/v5p3/UpgraderStatus.php
rename to update/Puc/v5p4/UpgraderStatus.php
index 81b1f4c..e8340fd 100644
--- a/update/Puc/v5p3/UpgraderStatus.php
+++ b/update/Puc/v5p4/UpgraderStatus.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(UpgraderStatus::class, false) ):
 
diff --git a/update/Puc/v5p3/Utils.php b/update/Puc/v5p4/Utils.php
similarity index 97%
rename from update/Puc/v5p3/Utils.php
rename to update/Puc/v5p4/Utils.php
index ddacf3f..2130996 100644
--- a/update/Puc/v5p3/Utils.php
+++ b/update/Puc/v5p4/Utils.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 if ( !class_exists(Utils::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/Api.php b/update/Puc/v5p4/Vcs/Api.php
similarity index 99%
rename from update/Puc/v5p3/Vcs/Api.php
rename to update/Puc/v5p4/Vcs/Api.php
index ec808c1..715f1de 100644
--- a/update/Puc/v5p3/Vcs/Api.php
+++ b/update/Puc/v5p4/Vcs/Api.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 use Parsedown;
 use PucReadmeParser;
diff --git a/update/Puc/v5p3/Vcs/BaseChecker.php b/update/Puc/v5p4/Vcs/BaseChecker.php
similarity index 90%
rename from update/Puc/v5p3/Vcs/BaseChecker.php
rename to update/Puc/v5p4/Vcs/BaseChecker.php
index d6e3f0b..78e0dde 100644
--- a/update/Puc/v5p3/Vcs/BaseChecker.php
+++ b/update/Puc/v5p4/Vcs/BaseChecker.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !interface_exists(BaseChecker::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/BitBucketApi.php b/update/Puc/v5p4/Vcs/BitBucketApi.php
similarity index 97%
rename from update/Puc/v5p3/Vcs/BitBucketApi.php
rename to update/Puc/v5p4/Vcs/BitBucketApi.php
index e7ed0c5..dbbaa07 100644
--- a/update/Puc/v5p3/Vcs/BitBucketApi.php
+++ b/update/Puc/v5p4/Vcs/BitBucketApi.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\OAuthSignature;
-use YahnisElsts\PluginUpdateChecker\v5p3\Utils;
+use YahnisElsts\PluginUpdateChecker\v5p4\OAuthSignature;
+use YahnisElsts\PluginUpdateChecker\v5p4\Utils;
 
 if ( !class_exists(BitBucketApi::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/GitHubApi.php b/update/Puc/v5p4/Vcs/GitHubApi.php
similarity index 99%
rename from update/Puc/v5p3/Vcs/GitHubApi.php
rename to update/Puc/v5p4/Vcs/GitHubApi.php
index 4858ab0..610d932 100644
--- a/update/Puc/v5p3/Vcs/GitHubApi.php
+++ b/update/Puc/v5p4/Vcs/GitHubApi.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 use Parsedown;
 
diff --git a/update/Puc/v5p3/Vcs/GitLabApi.php b/update/Puc/v5p4/Vcs/GitLabApi.php
similarity index 99%
rename from update/Puc/v5p3/Vcs/GitLabApi.php
rename to update/Puc/v5p4/Vcs/GitLabApi.php
index ee07149..2cbd6eb 100644
--- a/update/Puc/v5p3/Vcs/GitLabApi.php
+++ b/update/Puc/v5p4/Vcs/GitLabApi.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !class_exists(GitLabApi::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/PluginUpdateChecker.php b/update/Puc/v5p4/Vcs/PluginUpdateChecker.php
similarity index 98%
rename from update/Puc/v5p3/Vcs/PluginUpdateChecker.php
rename to update/Puc/v5p4/Vcs/PluginUpdateChecker.php
index e9aee45..f00097f 100644
--- a/update/Puc/v5p3/Vcs/PluginUpdateChecker.php
+++ b/update/Puc/v5p4/Vcs/PluginUpdateChecker.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Plugin;
+use YahnisElsts\PluginUpdateChecker\v5p4\Plugin;
 
 if ( !class_exists(PluginUpdateChecker::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/Reference.php b/update/Puc/v5p4/Vcs/Reference.php
similarity index 95%
rename from update/Puc/v5p3/Vcs/Reference.php
rename to update/Puc/v5p4/Vcs/Reference.php
index 7f6988a..c30bcf7 100644
--- a/update/Puc/v5p3/Vcs/Reference.php
+++ b/update/Puc/v5p4/Vcs/Reference.php
@@ -1,5 +1,5 @@
 <?php
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !class_exists(Reference::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/ReleaseAssetSupport.php b/update/Puc/v5p4/Vcs/ReleaseAssetSupport.php
similarity index 97%
rename from update/Puc/v5p3/Vcs/ReleaseAssetSupport.php
rename to update/Puc/v5p4/Vcs/ReleaseAssetSupport.php
index c5bd2da..352fc5e 100644
--- a/update/Puc/v5p3/Vcs/ReleaseAssetSupport.php
+++ b/update/Puc/v5p4/Vcs/ReleaseAssetSupport.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !trait_exists(ReleaseAssetSupport::class, false) ) :
 
diff --git a/update/Puc/v5p3/Vcs/ReleaseFilteringFeature.php b/update/Puc/v5p4/Vcs/ReleaseFilteringFeature.php
similarity index 98%
rename from update/Puc/v5p3/Vcs/ReleaseFilteringFeature.php
rename to update/Puc/v5p4/Vcs/ReleaseFilteringFeature.php
index bf372cd..bbf9c47 100644
--- a/update/Puc/v5p3/Vcs/ReleaseFilteringFeature.php
+++ b/update/Puc/v5p4/Vcs/ReleaseFilteringFeature.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !trait_exists(ReleaseFilteringFeature::class, false) ) :
 
diff --git a/update/Puc/v5p3/Vcs/ThemeUpdateChecker.php b/update/Puc/v5p4/Vcs/ThemeUpdateChecker.php
similarity index 94%
rename from update/Puc/v5p3/Vcs/ThemeUpdateChecker.php
rename to update/Puc/v5p4/Vcs/ThemeUpdateChecker.php
index 04f6036..3d16f19 100644
--- a/update/Puc/v5p3/Vcs/ThemeUpdateChecker.php
+++ b/update/Puc/v5p4/Vcs/ThemeUpdateChecker.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
-use YahnisElsts\PluginUpdateChecker\v5p3\Theme;
-use YahnisElsts\PluginUpdateChecker\v5p3\Utils;
+use YahnisElsts\PluginUpdateChecker\v5p4\Theme;
+use YahnisElsts\PluginUpdateChecker\v5p4\Utils;
 
 if ( !class_exists(ThemeUpdateChecker::class, false) ):
 
diff --git a/update/Puc/v5p3/Vcs/VcsCheckerMethods.php b/update/Puc/v5p4/Vcs/VcsCheckerMethods.php
similarity index 95%
rename from update/Puc/v5p3/Vcs/VcsCheckerMethods.php
rename to update/Puc/v5p4/Vcs/VcsCheckerMethods.php
index 5b89cf6..e5a5608 100644
--- a/update/Puc/v5p3/Vcs/VcsCheckerMethods.php
+++ b/update/Puc/v5p4/Vcs/VcsCheckerMethods.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3\Vcs;
+namespace YahnisElsts\PluginUpdateChecker\v5p4\Vcs;
 
 if ( !trait_exists(VcsCheckerMethods::class, false) ) :
 
diff --git a/update/Puc/v5p4/WpCliCheckTrigger.php b/update/Puc/v5p4/WpCliCheckTrigger.php
new file mode 100644
index 0000000..523cca4
--- /dev/null
+++ b/update/Puc/v5p4/WpCliCheckTrigger.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
+
+use WP_CLI;
+
+/**
+ * Triggers an update check when relevant WP-CLI commands are executed.
+ *
+ * When WP-CLI runs certain commands like "wp plugin status" or "wp theme list", it calls
+ * wp_update_plugins() and wp_update_themes() to refresh update information. This class hooks into
+ * the same commands and triggers an update check when they are executed.
+ *
+ * Note that wp_update_plugins() and wp_update_themes() do not perform an update check *every* time
+ * they are called. They use a context-dependent delay between update checks. Similarly, this class
+ * calls Scheduler::maybeCheckForUpdates(), which also dynamically decides whether to actually
+ * run a check. If you want to force an update check, call UpdateChecker::checkForUpdates() instead.
+ */
+class WpCliCheckTrigger {
+	/**
+	 * @var Scheduler
+	 */
+	private $scheduler;
+
+	/**
+	 * @var string 'plugin' or 'theme'
+	 */
+	private $componentType;
+
+	/**
+	 * @var bool Whether an update check was already triggered during the current request
+	 *           or script execution.
+	 */
+	private $wasCheckTriggered = false;
+
+	public function __construct($componentType, Scheduler $scheduler) {
+		if ( !in_array($componentType, ['plugin', 'theme']) ) {
+			throw new \InvalidArgumentException('Invalid component type. Must be "plugin" or "theme".');
+		}
+
+		$this->componentType = $componentType;
+		$this->scheduler = $scheduler;
+
+		if ( !defined('WP_CLI') || !class_exists(WP_CLI::class, false) ) {
+			return; //Nothing to do if WP-CLI is not available.
+		}
+
+		/*
+		 * We can't hook directly into wp_update_plugins(), but we can hook into the WP-CLI
+		 * commands that call it. We'll use the "before_invoke:xyz" hook to trigger update checks.
+		 */
+		foreach ($this->getRelevantCommands() as $command) {
+			WP_CLI::add_hook('before_invoke:' . $command, [$this, 'triggerUpdateCheckOnce']);
+		}
+	}
+
+	private function getRelevantCommands() {
+		$result = [];
+		foreach (['status', 'list', 'update'] as $subcommand) {
+			$result[] = $this->componentType . ' ' . $subcommand;
+		}
+		return $result;
+	}
+
+	/**
+	 * Trigger a potential update check once.
+	 *
+	 * @param mixed $input
+	 * @return mixed The input value, unchanged.
+	 * @internal This method is public so that it can be used as a WP-CLI hook callback.
+	 *           It should not be called directly.
+	 *
+	 */
+	public function triggerUpdateCheckOnce($input = null) {
+		if ( $this->wasCheckTriggered ) {
+			return $input;
+		}
+
+		$this->wasCheckTriggered = true;
+		$this->scheduler->maybeCheckForUpdates();
+
+		return $input;
+	}
+}
\ No newline at end of file
diff --git a/update/README.md b/update/README.md
index 1af16f0..4c1c197 100644
--- a/update/README.md
+++ b/update/README.md
@@ -252,8 +252,8 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
 
 	Alternatively, if you're using a self-hosted GitLab instance, initialize the update checker like this:
 	```php
-	use YahnisElsts\PluginUpdateChecker\v5p3\Vcs\PluginUpdateChecker;
-	use YahnisElsts\PluginUpdateChecker\v5p3\Vcs\GitLabApi;
+	use YahnisElsts\PluginUpdateChecker\v5p4\Vcs\PluginUpdateChecker;
+	use YahnisElsts\PluginUpdateChecker\v5p4\Vcs\GitLabApi;
 	
 	$myUpdateChecker = new PluginUpdateChecker(
 		new GitLabApi('https://myserver.com/user-name/repo-name/'),
@@ -264,8 +264,8 @@ BitBucket doesn't have an equivalent to GitHub's releases, so the process is sli
 	```
 	If you're using a self-hosted GitLab instance and [subgroups or nested groups](https://docs.gitlab.com/ce/user/group/subgroups/index.html), you have to tell the update checker which parts of the URL are subgroups:
 	```php
-	use YahnisElsts\PluginUpdateChecker\v5p3\Vcs\PluginUpdateChecker;
-	use YahnisElsts\PluginUpdateChecker\v5p3\Vcs\GitLabApi;
+	use YahnisElsts\PluginUpdateChecker\v5p4\Vcs\PluginUpdateChecker;
+	use YahnisElsts\PluginUpdateChecker\v5p4\Vcs\GitLabApi;
    
 	$myUpdateChecker = new PluginUpdateChecker(
 		new GitLabApi(
@@ -347,14 +347,14 @@ Other classes have also been renamed, usually by simply removing the `Puc_vXpY_`
 | Old class name                      | New class name                                                 |
 |-------------------------------------|----------------------------------------------------------------|
 | `Puc_v4_Factory`                    | `YahnisElsts\PluginUpdateChecker\v5\PucFactory`                |
-| `Puc_v4p13_Factory`                 | `YahnisElsts\PluginUpdateChecker\v5p3\PucFactory`              |
-| `Puc_v4p13_Plugin_UpdateChecker`    | `YahnisElsts\PluginUpdateChecker\v5p3\Plugin\UpdateChecker`    |
-| `Puc_v4p13_Theme_UpdateChecker`     | `YahnisElsts\PluginUpdateChecker\v5p3\Theme\UpdateChecker`     |
-| `Puc_v4p13_Vcs_PluginUpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p3\Vcs\PluginUpdateChecker` |
-| `Puc_v4p13_Vcs_ThemeUpdateChecker`  | `YahnisElsts\PluginUpdateChecker\v5p3\Vcs\ThemeUpdateChecker`  |
-| `Puc_v4p13_Vcs_GitHubApi`           | `YahnisElsts\PluginUpdateChecker\v5p3\Vcs\GitHubApi`           |
-| `Puc_v4p13_Vcs_GitLabApi`           | `YahnisElsts\PluginUpdateChecker\v5p3\Vcs\GitLabApi`           |
-| `Puc_v4p13_Vcs_BitBucketApi`        | `YahnisElsts\PluginUpdateChecker\v5p3\Vcs\BitBucketApi`        |
+| `Puc_v4p13_Factory`                 | `YahnisElsts\PluginUpdateChecker\v5p4\PucFactory`              |
+| `Puc_v4p13_Plugin_UpdateChecker`    | `YahnisElsts\PluginUpdateChecker\v5p4\Plugin\UpdateChecker`    |
+| `Puc_v4p13_Theme_UpdateChecker`     | `YahnisElsts\PluginUpdateChecker\v5p4\Theme\UpdateChecker`     |
+| `Puc_v4p13_Vcs_PluginUpdateChecker` | `YahnisElsts\PluginUpdateChecker\v5p4\Vcs\PluginUpdateChecker` |
+| `Puc_v4p13_Vcs_ThemeUpdateChecker`  | `YahnisElsts\PluginUpdateChecker\v5p4\Vcs\ThemeUpdateChecker`  |
+| `Puc_v4p13_Vcs_GitHubApi`           | `YahnisElsts\PluginUpdateChecker\v5p4\Vcs\GitHubApi`           |
+| `Puc_v4p13_Vcs_GitLabApi`           | `YahnisElsts\PluginUpdateChecker\v5p4\Vcs\GitLabApi`           |
+| `Puc_v4p13_Vcs_BitBucketApi`        | `YahnisElsts\PluginUpdateChecker\v5p4\Vcs\BitBucketApi`        |
 
 License Management
 ------------------
diff --git a/update/composer.json b/update/composer.json
index 27b65b0..f7af7eb 100644
--- a/update/composer.json
+++ b/update/composer.json
@@ -18,6 +18,6 @@
 		"ext-json": "*"
 	},
 	"autoload": {
-		"files": ["load-v5p3.php"]
+		"files": ["load-v5p4.php"]
 	}
 }
diff --git a/update/examples/plugin.json b/update/examples/plugin.json
deleted file mode 100644
index 946b730..0000000
--- a/update/examples/plugin.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-	"name": "My Example Plugin",
-	"version": "2.0",
-	"download_url": "http://example.com/updates/example-plugin.zip",
-
-	"homepage": "http://example.com/",
-	"requires": "4.5",
-	"tested": "4.8",
-	"last_updated": "2017-01-01 16:17:00",
-	"upgrade_notice": "Here's why you should upgrade...",
-
-	"author": "Janis Elsts",
-	"author_homepage": "http://example.com/",
-
-	"sections": {
-		"description": "(Required) Plugin description. Basic HTML can be used in all sections.",
-		"installation": "(Recommended) Installation instructions.",
-		"changelog": "(Recommended) Changelog. <p>This section will be displayed by default when the user clicks 'View version x.y.z details'.</p>",
-		"custom_section": "This is a custom section labeled 'Custom Section'."
-	},
-	
-	"icons" : {
-		"1x" : "http://w-shadow.com/files/external-update-example/assets/icon-128x128.png",
-		"2x" : "http://w-shadow.com/files/external-update-example/assets/icon-256x256.png"
-    },
-
-	"banners": {
-		"low": "http://w-shadow.com/files/external-update-example/assets/banner-772x250.png",
-		"high": "http://w-shadow.com/files/external-update-example/assets/banner-1544x500.png"
-	},
-
-	"translations": [
-		{
-			"language": "fr_FR",
-			"version": "4.0",
-			"updated": "2016-04-22 23:22:42",
-			"package": "http://example.com/updates/translations/french-language-pack.zip"
-		},
-		{
-			"language": "de_DE",
-			"version": "5.0",
-			"updated": "2016-04-22 23:22:42",
-			"package": "http://example.com/updates/translations/german-language-pack.zip"
-		}
-	],
-
-	"rating": 90,
-	"num_ratings": 123,
-
-	"downloaded": 1234,
-	"active_installs": 12345
-}
\ No newline at end of file
diff --git a/update/examples/theme.json b/update/examples/theme.json
deleted file mode 100644
index 0e08072..0000000
--- a/update/examples/theme.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"version": "2.0",
-	"details_url": "http://example.com/version-2.0-details.html",
-	"download_url": "http://example.com/example-theme-2.0.zip"
-}
\ No newline at end of file
diff --git a/update/languages/plugin-update-checker.pot b/update/languages/plugin-update-checker.pot
index 4985307..5b6319c 100644
--- a/update/languages/plugin-update-checker.pot
+++ b/update/languages/plugin-update-checker.pot
@@ -17,33 +17,33 @@ msgstr ""
 "X-Poedit-KeywordsList: __;_e;_x:1,2c;_x\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: Puc/v5p3/Plugin/Ui.php:128
+#: Puc/v5p4/Plugin/Ui.php:128
 msgid "Check for updates"
 msgstr ""
 
-#: Puc/v5p3/Plugin/Ui.php:214
+#: Puc/v5p4/Plugin/Ui.php:214
 #, php-format
 msgctxt "the plugin title"
 msgid "The %s plugin is up to date."
 msgstr ""
 
-#: Puc/v5p3/Plugin/Ui.php:216
+#: Puc/v5p4/Plugin/Ui.php:216
 #, php-format
 msgctxt "the plugin title"
 msgid "A new version of the %s plugin is available."
 msgstr ""
 
-#: Puc/v5p3/Plugin/Ui.php:218
+#: Puc/v5p4/Plugin/Ui.php:218
 #, php-format
 msgctxt "the plugin title"
 msgid "Could not determine if updates are available for %s."
 msgstr ""
 
-#: Puc/v5p3/Plugin/Ui.php:224
+#: Puc/v5p4/Plugin/Ui.php:224
 #, php-format
 msgid "Unknown update checker status \"%s\""
 msgstr ""
 
-#: Puc/v5p3/Vcs/PluginUpdateChecker.php:100
+#: Puc/v5p4/Vcs/PluginUpdateChecker.php:100
 msgid "There is no changelog available."
 msgstr ""
diff --git a/update/load-v5p3.php b/update/load-v5p4.php
similarity index 80%
rename from update/load-v5p3.php
rename to update/load-v5p4.php
index 1de3d58..2cd9580 100644
--- a/update/load-v5p3.php
+++ b/update/load-v5p4.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace YahnisElsts\PluginUpdateChecker\v5p3;
+namespace YahnisElsts\PluginUpdateChecker\v5p4;
 
 use YahnisElsts\PluginUpdateChecker\v5\PucFactory as MajorFactory;
-use YahnisElsts\PluginUpdateChecker\v5p3\PucFactory as MinorFactory;
+use YahnisElsts\PluginUpdateChecker\v5p4\PucFactory as MinorFactory;
 
-require __DIR__ . '/Puc/v5p3/Autoloader.php';
+require __DIR__ . '/Puc/v5p4/Autoloader.php';
 new Autoloader();
 
-require __DIR__ . '/Puc/v5p3/PucFactory.php';
+require __DIR__ . '/Puc/v5p4/PucFactory.php';
 require __DIR__ . '/Puc/v5/PucFactory.php';
 
 //Register classes defined in this version with the factory.
@@ -26,9 +26,9 @@
 	)
 	as $pucGeneralClass => $pucVersionedClass
 ) {
-	MajorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.3');
+	MajorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.4');
 	//Also add it to the minor-version factory in case the major-version factory
 	//was already defined by another, older version of the update checker.
-	MinorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.3');
+	MinorFactory::addVersion($pucGeneralClass, $pucVersionedClass, '5.4');
 }
 
diff --git a/update/phpcs.xml b/update/phpcs.xml
deleted file mode 100644
index e8260b9..0000000
--- a/update/phpcs.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="PUC_PHPCS_Settings">
-    <description>PHPCS settings for Plugin Update Checker</description>
-
-    <arg name="basepath" value="."/>
-    <arg name="warning-severity" value="5"/>
-    <arg name="error-severity" value="5"/>
-    <arg value="sp"/>
-    
-    <!-- Check the current directory by default -->
-    <file>./</file>
-    
-    <!-- Include the WordPress-VIP-Go standard -->
-    <rule ref="WordPress-VIP-Go">
-		<!-- This library is not exclusive to WP VIP, so it doesn't use vip_safe_wp_remote_get() and such. -->
-		<exclude name="WordPressVIPMinimum.Functions.RestrictedFunctions.wp_remote_get_wp_remote_get" />
-    </rule>
-    
-    <!-- Exclude external and third-party libraries -->
-    <exclude-pattern type="relative">^vendor/*</exclude-pattern>
-</ruleset>
diff --git a/update/plugin-update-checker.php b/update/plugin-update-checker.php
index 7a9268c..da4cb1e 100644
--- a/update/plugin-update-checker.php
+++ b/update/plugin-update-checker.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Plugin Update Checker Library 5.3
+ * Plugin Update Checker Library 5.4
  * http://w-shadow.com/
  *
- * Copyright 2022 Janis Elsts
+ * Copyright 2024 Janis Elsts
  * Released under the MIT license. See license.txt for details.
  */
 
-require dirname(__FILE__) . '/load-v5p3.php';
\ No newline at end of file
+require dirname(__FILE__) . '/load-v5p4.php';
\ No newline at end of file