diff --git a/plugin-update-checker.php b/plugin-update-checker.php
index f521f9d..b62b35a 100644
--- a/plugin-update-checker.php
+++ b/plugin-update-checker.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Update Checker Library 4.5
  * http://w-shadow.com/
- * 
+ *
  * Copyright 2019 Janis Elsts
  * Released under the MIT license. See license.txt for details.
  */
@@ -12,13 +12,23 @@ require dirname(__FILE__) . '/Puc/v4/Factory.php';
 require dirname(__FILE__) . '/Puc/v4p5/Autoloader.php';
 new Puc_v4p5_Autoloader();
 
-//Register classes defined in this file with the factory.
-Puc_v4_Factory::addVersion('Plugin_UpdateChecker', 'Puc_v4p5_Plugin_UpdateChecker', '4.5');
-Puc_v4_Factory::addVersion('Theme_UpdateChecker', 'Puc_v4p5_Theme_UpdateChecker', '4.5');
+//Register classes defined in this version with the factory.
+foreach (
+	array(
+		'Plugin_UpdateChecker' => 'Puc_v4p5_Plugin_UpdateChecker',
+		'Theme_UpdateChecker'  => 'Puc_v4p5_Theme_UpdateChecker',
 
-Puc_v4_Factory::addVersion('Vcs_PluginUpdateChecker', 'Puc_v4p5_Vcs_PluginUpdateChecker', '4.5');
-Puc_v4_Factory::addVersion('Vcs_ThemeUpdateChecker', 'Puc_v4p5_Vcs_ThemeUpdateChecker', '4.5');
+		'Vcs_PluginUpdateChecker' => 'Puc_v4p5_Vcs_PluginUpdateChecker',
+		'Vcs_ThemeUpdateChecker'  => 'Puc_v4p5_Vcs_ThemeUpdateChecker',
 
-Puc_v4_Factory::addVersion('GitHubApi', 'Puc_v4p5_Vcs_GitHubApi', '4.5');
-Puc_v4_Factory::addVersion('BitBucketApi', 'Puc_v4p5_Vcs_BitBucketApi', '4.5');
-Puc_v4_Factory::addVersion('GitLabApi', 'Puc_v4p5_Vcs_GitLabApi', '4.5');
\ No newline at end of file
+		'GitHubApi'    => 'Puc_v4p5_Vcs_GitHubApi',
+		'BitBucketApi' => 'Puc_v4p5_Vcs_BitBucketApi',
+		'GitLabApi'    => 'Puc_v4p5_Vcs_GitLabApi',
+	)
+	as $pucGeneralClass => $pucVersionedClass
+) {
+	Puc_v4_Factory::addVersion($pucGeneralClass, $pucVersionedClass, '4.5');
+	//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.
+	Puc_v4p5_Factory::addVersion($pucGeneralClass, $pucVersionedClass, '4.5');
+}
\ No newline at end of file