diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
index 102b92f901845..d084d20d0a3ee 100644
--- a/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
+++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default_upload.php
@@ -96,7 +96,9 @@
 					<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_UPLOAD_PACKAGE_FILE'); ?>
 				</td>
 				<td>
-					<input class="input_box" id="install_package" name="install_package" type="file" size="57" />
+					<input class="input_box" id="install_package" name="install_package" type="file" size="57" /><br>
+					<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize()); ?>
+					<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
 				</td>
 			</tr>
 			<tr>
diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php
index c51d110593dc6..02fecf1d89de2 100644
--- a/administrator/components/com_media/views/images/tmpl/default.php
+++ b/administrator/components/com_media/views/images/tmpl/default.php
@@ -175,7 +175,12 @@
 						</div>
 						<div class="controls">
 							<input required type="file" id="upload-file" name="Filedata[]" multiple /><button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
-							<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
+							<p class="help-block"><?php
+								$cMax    = (int) $this->config->get('upload_maxsize');
+								$maxSize = JUtility::getMaxUploadSize($cMax . 'MB');
+
+								echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize));
+							?></p>
 						</div>
 					</div>
 				</fieldset>
diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php
index ca25d3573383a..b73162ac63be4 100644
--- a/administrator/components/com_media/views/media/tmpl/default.php
+++ b/administrator/components/com_media/views/media/tmpl/default.php
@@ -88,7 +88,12 @@
 					<fieldset id="upload-noflash" class="actions">
 							<label for="upload-file" class="control-label"><?php echo JText::_('COM_MEDIA_UPLOAD_FILE'); ?></label>
 								<input required type="file" id="upload-file" name="Filedata[]" multiple /> <button class="btn btn-primary" id="upload-submit"><span class="icon-upload icon-white"></span> <?php echo JText::_('COM_MEDIA_START_UPLOAD'); ?></button>
-								<p class="help-block"><?php echo $this->config->get('upload_maxsize') == '0' ? JText::_('COM_MEDIA_UPLOAD_FILES_NOLIMIT') : JText::sprintf('COM_MEDIA_UPLOAD_FILES', $this->config->get('upload_maxsize')); ?></p>
+								<p class="help-block"><?php
+									$cMax    = (int) $this->config->get('upload_maxsize');
+									$maxSize = JUtility::getMaxUploadSize($cMax . 'MB');
+
+									echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', JHtml::_('number.bytes', $maxSize));
+								?></p>
 					</fieldset>
 					<input class="update-folder" type="hidden" name="folder" id="folder" value="<?php echo $this->state->folder; ?>" />
 					<?php JFactory::getSession()->set('com_media.return_url', 'index.php?option=com_media'); ?>
diff --git a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
index cc5de0f5d8e5b..c86e830e0fecd 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_modal_file_body.php
@@ -40,7 +40,10 @@
 					<input type="hidden" class="address" name="address" />
 					<input type="file" name="files" required />
 					<?php echo JHtml::_('form.token'); ?>
-					<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD');?>" class="btn btn-primary" />
+					<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD');?>" class="btn btn-primary" /><br>
+					<?php $cMax    = $this->state->get('params')->get('upload_limit'); ?>
+					<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize($cMax . 'MB')); ?>
+					<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
 				</fieldset>
 			</form>
 			<?php if ($this->type != 'home'): ?>
diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index dea460eac939e..f9cb7e3fca0ce 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -91,8 +91,6 @@ COM_MEDIA_START_UPLOAD="Start Upload"
 COM_MEDIA_THUMBNAIL_VIEW="Thumbnail View"
 COM_MEDIA_TITLE="Image Title"
 COM_MEDIA_UPLOAD_COMPLETE="Upload Complete: %s"
-COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)"
-COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)"
 COM_MEDIA_UPLOAD_FILE="Upload file"
 COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
 COM_MEDIA_UPLOAD="Upload"
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 384e6218cdfc3..20c2eb37e65af 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -423,6 +423,7 @@ JGLOBAL_LOOKING_FOR="Looking for"
 JGLOBAL_LT="&lt;"
 JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC="The number of subcategory levels to display."
 JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL="Subcategory Levels"
+JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: <strong>%s</strong>"
 JGLOBAL_MAXLEVEL_DESC="Maximum number of levels of subcategories to show."
 JGLOBAL_MAXLEVEL_LABEL="Subcategory Levels"
 JGLOBAL_MENU_SELECTION="Menu Selection:"
diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php
index f37c916fc0a33..aa8073afbacfd 100644
--- a/administrator/templates/hathor/html/com_templates/template/default.php
+++ b/administrator/templates/hathor/html/com_templates/template/default.php
@@ -217,7 +217,10 @@ function clearCoords()
 						<fieldset>
 							<input type="hidden" class="address" name="address" />
 							<input type="file" name="files" required />
-							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD');?>" class="btn btn-primary" />
+							<input type="submit" value="<?php echo JText::_('COM_TEMPLATES_BUTTON_UPLOAD');?>" class="btn btn-primary" /><br>
+							<?php $cMax    = $this->state->get('params')->get('upload_limit'); ?>
+							<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize($cMax . 'MB')); ?>
+							<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
 						</fieldset>
 					</form>
 					<br />
diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini
index 6734833c394ef..5befff0ce864a 100644
--- a/language/en-GB/en-GB.com_media.ini
+++ b/language/en-GB/en-GB.com_media.ini
@@ -71,6 +71,4 @@ COM_MEDIA_UP="Up"
 COM_MEDIA_UPLOAD="Upload"
 COM_MEDIA_UPLOAD_COMPLETE="Upload Complete"
 COM_MEDIA_UPLOAD_FILE="Upload file"
-COM_MEDIA_UPLOAD_FILES="Upload files (Maximum Size: %s MB)"
-COM_MEDIA_UPLOAD_FILES_NOLIMIT="Upload files (No maximum size)"
 COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful"
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index 6dcacb0d8cd26..932947d277e03 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -234,6 +234,7 @@ JGLOBAL_KEEP_TYPING="Keep typing ..."
 JGLOBAL_LEFT="Left"
 JGLOBAL_LOOKING_FOR="Looking for"
 JGLOBAL_LT="&lt;"
+JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: <strong>%s</strong>"
 JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved."
 JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
 JGLOBAL_NUM="#"
diff --git a/layouts/joomla/form/field/file.php b/layouts/joomla/form/field/file.php
index 4100a3ad501b7..88b30e8a5ad27 100644
--- a/layouts/joomla/form/field/file.php
+++ b/layouts/joomla/form/field/file.php
@@ -59,4 +59,7 @@
 	<?php echo $disabled ? ' disabled' : ''; ?>
 	<?php echo $autofocus ? ' autofocus' : ''; ?>
 	<?php echo !empty($onchange) ? ' onchange="' . $onchange . '"' : ''; ?>
-	<?php echo $required ? ' required aria-required="true"' : ''; ?> />
+	<?php echo $required ? ' required aria-required="true"' : ''; ?> /><br>
+<?php
+$maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize());
+echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize);
diff --git a/libraries/joomla/utilities/utility.php b/libraries/joomla/utilities/utility.php
index 69c8cb5334b01..be669584de7b7 100644
--- a/libraries/joomla/utilities/utility.php
+++ b/libraries/joomla/utilities/utility.php
@@ -45,4 +45,37 @@ public static function parseAttributes($string)
 
 		return $retarray;
 	}
+
+	/**
+	 * Method to get the maximum allowed file size for the HTTP uploads based on the active PHP configuration
+	 *
+	 * @param   mixed  $custom  A custom upper limit, if the PHP settings are all above this then this will be used
+	 *
+	 * @return  int  Size in number of bytes
+	 *
+	 * @since  __DEPLOY_VERSION__
+	 */
+	public static function getMaxUploadSize($custom = null)
+	{
+		if ($custom)
+		{
+			$custom = JHtml::_('number.bytes', $custom, '');
+
+			if ($custom > 0)
+			{
+				$sizes[] = $custom;
+			}
+		}
+
+		/*
+		 * Read INI settings which affects upload size limits
+		 * and Convert each into number of bytes so that we can compare
+		 */
+		$sizes[] = JHtml::_('number.bytes', ini_get('memory_limit'), '');
+		$sizes[] = JHtml::_('number.bytes', ini_get('post_max_size'), '');
+		$sizes[] = JHtml::_('number.bytes', ini_get('upload_max_filesize'), '');
+
+		// The minimum of these is the limiting factor
+		return min($sizes);
+	}
 }
diff --git a/plugins/installer/packageinstaller/tmpl/default.php b/plugins/installer/packageinstaller/tmpl/default.php
index bd029d880a87f..baf7a730dd259 100644
--- a/plugins/installer/packageinstaller/tmpl/default.php
+++ b/plugins/installer/packageinstaller/tmpl/default.php
@@ -34,7 +34,9 @@
 <div class="control-group">
 	<label for="install_package" class="control-label"><?php echo JText::_('PLG_INSTALLER_PACKAGEINSTALLER_EXTENSION_PACKAGE_FILE'); ?></label>
 	<div class="controls">
-		<input class="input_box" id="install_package" name="install_package" type="file" size="57" />
+		<input class="input_box" id="install_package" name="install_package" type="file" size="57" /><br>
+		<?php $maxSize = JHtml::_('number.bytes', JUtility::getMaxUploadSize()); ?>
+		<?php echo JText::sprintf('JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT', $maxSize); ?>
 	</div>
 </div>
 <div class="form-actions">