diff --git a/admin.php b/admin.php
index ef03c89f9..0994606ab 100644
--- a/admin.php
+++ b/admin.php
@@ -228,14 +228,18 @@ $template->assign(
     'U_PLUGINS'=> $link_start.'plugins',
     'U_ADD_PHOTOS' => $link_start.'photos_add',
     'U_CHANGE_THEME' => $change_theme_url,
-    'U_UPDATES' => $link_start.'updates',
     'ADMIN_PAGE_TITLE' => 'Piwigo Administration Page',
     'ADMIN_PAGE_OBJECT_ID' => '',
     'U_SHOW_TEMPLATE_TAB' => $conf['show_template_in_side_menu'],
     'SHOW_RATING' => $conf['rate'],
     )
   );
-  
+
+if ($conf['enable_core_update'])
+{
+  $template->assign('U_UPDATES', $link_start.'updates');
+}
+
 if ($conf['activate_comments'])
 {
   $template->assign('U_COMMENTS', $link_start.'comments');
diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php
index dddc7063b..ce1473585 100644
--- a/admin/include/add_core_tabs.inc.php
+++ b/admin/include/add_core_tabs.inc.php
@@ -10,6 +10,8 @@ add_event_handler('tabsheet_before_select', 'add_core_tabs', 0);
 
 function add_core_tabs($sheets, $tab_id)
 {
+  global $conf;
+
   switch($tab_id)
   {
     case 'admin_home':
@@ -49,7 +51,7 @@ function add_core_tabs($sheets, $tab_id)
       break;
 
     case 'cat_options':
-      global $link_start, $conf;
+      global $link_start;
       $sheets['status'] = array('caption' => '<span class="icon-lock"></span>'.l10n('Public / Private'), 'url' => $link_start.'cat_options&amp;section=status');
       $sheets['visible'] = array('caption' => '<span class="icon-block"></span>'.l10n('Lock'), 'url' => $link_start.'cat_options&amp;section=visible');
       if ($conf['activate_comments'])
@@ -101,8 +103,11 @@ function add_core_tabs($sheets, $tab_id)
     case 'languages':
       global $my_base_url;
       $sheets['installed'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'&amp;tab=installed');
-      $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
-      $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Language'), 'url' => $my_base_url.'&amp;tab=new');
+      if ($conf['enable_extensions_install'])
+      {
+        $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
+        $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Language'), 'url' => $my_base_url.'&amp;tab=new');
+      }
       break;
 
     case 'menus':
@@ -128,7 +133,6 @@ function add_core_tabs($sheets, $tab_id)
       break;
 
     case 'photos_add':
-      global $conf;
       $sheets['direct'] = array('caption' => '<span class="icon-upload"></span>'.l10n('Web Form'), 'url' => PHOTOS_ADD_BASE_URL.'&amp;section=direct');
       $sheets['applications'] = array('caption' => '<span class="icon-network"></span>'.l10n('Applications'), 'url' => PHOTOS_ADD_BASE_URL.'&amp;section=applications');
       if ($conf['enable_synchronization'])
@@ -138,8 +142,11 @@ function add_core_tabs($sheets, $tab_id)
     case 'plugins':
       global $my_base_url;
       $sheets['installed'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'&amp;tab=installed');
-      $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
-      $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Plugin'), 'url' => $my_base_url.'&amp;tab=new');
+      if ($conf['enable_extensions_install'])
+      {
+        $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
+        $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Plugin'), 'url' => $my_base_url.'&amp;tab=new');
+      }
       break;
 
     case 'rating':
@@ -150,14 +157,25 @@ function add_core_tabs($sheets, $tab_id)
     case 'themes':
       global $my_base_url;
       $sheets['installed'] = array('caption' => '<span class="icon-menu"></span>'.l10n('List'), 'url' => $my_base_url.'&amp;tab=installed');
-      $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
-      $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Theme'), 'url' => $my_base_url.'&amp;tab=new');
+      if ($conf['enable_extensions_install'])
+      {
+        $sheets['update'] = array('caption' => '<span class="icon-arrows-cw"></span>'.l10n('Check for updates'), 'url' => $my_base_url.'&amp;tab=update');
+        $sheets['new'] = array('caption' => '<span class="icon-plus-circled"></span>'.l10n('Add New Theme'), 'url' => $my_base_url.'&amp;tab=new');
+      }
       break;
 
     case 'updates':
       global $my_base_url;
-      $sheets['pwg'] = array('caption' => l10n('Piwigo core'), 'url' => $my_base_url);
-      $sheets['ext'] = array('caption' => l10n('Extensions'), 'url' => $my_base_url.'&amp;tab=ext');
+
+      if ($conf['enable_core_update'])
+      {
+        $sheets['pwg'] = array('caption' => l10n('Piwigo core'), 'url' => $my_base_url);
+      }
+
+      if ($conf['enable_extensions_install'])
+      {
+        $sheets['ext'] = array('caption' => l10n('Extensions'), 'url' => $my_base_url.'&amp;tab=ext');
+      }
       break;
     case 'site_update':
       global $my_base_url;
diff --git a/admin/languages_new.php b/admin/languages_new.php
index 60bbc0f5e..d0d408fd6 100644
--- a/admin/languages_new.php
+++ b/admin/languages_new.php
@@ -11,6 +11,11 @@ if( !defined("PHPWG_ROOT_PATH") )
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_extensions_install'])
+{
+  die('Piwigo extensions install/update system is disabled');
+}
+
 include_once(PHPWG_ROOT_PATH.'admin/include/languages.class.php');
 
 $template->set_filenames(array('languages' => 'languages_new.tpl'));
diff --git a/admin/plugins_new.php b/admin/plugins_new.php
index 2c28eb98f..991c49948 100644
--- a/admin/plugins_new.php
+++ b/admin/plugins_new.php
@@ -11,6 +11,11 @@ if( !defined("PHPWG_ROOT_PATH") )
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_extensions_install'])
+{
+  die('Piwigo extensions install/update system is disabled');
+}
+
 include_once(PHPWG_ROOT_PATH.'admin/include/plugins.class.php');
 
 $template->set_filenames(array('plugins' => 'plugins_new.tpl'));
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index ecc96808c..b7d1d6918 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -105,7 +105,9 @@ jQuery(document).ready(function() {
           <span class="adminMenubarCounter" title="{'%d waiting for validation'|translate:$NB_PENDING_COMMENTS}">{$NB_PENDING_COMMENTS}</span>
         {/if}</a></li>
 {/if}
+{if isset($U_UPDATES)}
         <li><a href="{$U_UPDATES}"><i class="icon-arrows-cw"></i>{'Updates'|@translate}</a></li>
+{/if}
       </ul>
 		</dd>
   </dl>
diff --git a/admin/themes_new.php b/admin/themes_new.php
index 12dfc148c..c42dc6714 100644
--- a/admin/themes_new.php
+++ b/admin/themes_new.php
@@ -11,6 +11,11 @@ if( !defined("PHPWG_ROOT_PATH") )
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_extensions_install'])
+{
+  die('Piwigo extensions install/update system is disabled');
+}
+
 include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php');
 
 $base_url = get_root_url().'admin.php?page='.$page['page'].'&tab='.$page['tab'];
diff --git a/admin/updates.php b/admin/updates.php
index 265c4e125..9e050071e 100644
--- a/admin/updates.php
+++ b/admin/updates.php
@@ -1,16 +1,21 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | This file is part of Piwigo.                                          |
-// |                                                                       |
-// | For copyright and license information, please view the COPYING.txt    |
-// | file that was distributed with this source code.                      |
-// +-----------------------------------------------------------------------+
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
 
 if( !defined("PHPWG_ROOT_PATH") )
 {
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_extensions_install'] and !$conf['enable_core_update'])
+{
+  die('update system is disabled');
+}
+
 include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
 
 $my_base_url = get_root_url().'admin.php?page=updates';
diff --git a/admin/updates_ext.php b/admin/updates_ext.php
index b773acd66..abead9a2d 100644
--- a/admin/updates_ext.php
+++ b/admin/updates_ext.php
@@ -11,6 +11,11 @@ if( !defined("PHPWG_ROOT_PATH") )
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_extensions_install'])
+{
+  die('Piwigo extensions install/update system is disabled');
+}
+
 if (!is_webmaster())
 {
   $page['warnings'][] = str_replace('%s', l10n('user_status_webmaster'), l10n('%s status is required to edit parameters.'));
diff --git a/admin/updates_pwg.php b/admin/updates_pwg.php
index 565335fd0..6d494c1f3 100644
--- a/admin/updates_pwg.php
+++ b/admin/updates_pwg.php
@@ -11,6 +11,11 @@ if( !defined("PHPWG_ROOT_PATH") )
   die ("Hacking attempt!");
 }
 
+if (!$conf['enable_core_update'])
+{
+  die('Piwigo core update system is disabled');
+}
+
 include_once(PHPWG_ROOT_PATH.'admin/include/updates.class.php');
 include_once(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php');
 
diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 19b110da1..1b72e1b84 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -853,6 +853,12 @@ $conf['themes_dir'] = PHPWG_ROOT_PATH.'themes';
 // enable the synchronization method for adding photos
 $conf['enable_synchronization'] = true;
 
+// enable the update of Piwigo core from administration pages
+$conf['enable_core_update'] = true;
+
+// enable install/update of plugins/themes/languages from administration pages
+$conf['enable_extensions_install'] = true;
+
 // Permitted characters for files/directories during synchronization.
 // Do not add the ' U+0027 single quote apostrophe character, it WILL make some
 // SQL queries fail. URI reserved characters (see
diff --git a/include/ws_functions/pwg.extensions.php b/include/ws_functions/pwg.extensions.php
index c983d8bd6..997f79763 100644
--- a/include/ws_functions/pwg.extensions.php
+++ b/include/ws_functions/pwg.extensions.php
@@ -133,6 +133,13 @@ function ws_themes_performAction($params, $service)
  */
 function ws_extensions_update($params, $service)
 {
+  global $conf;
+
+  if (!$conf['enable_extensions_install'])
+  {
+    return new PwgError(401, 'Piwigo extensions install/update system is disabled');
+  }
+
   if (!is_webmaster())
   {
     return new PwgError(401, l10n('Webmaster status is required.'));