diff --git a/BUILDING b/BUILDING
index 066b14d9e..6a2a6e863 100644
--- a/BUILDING
+++ b/BUILDING
@@ -45,6 +45,10 @@ Linux / Unix
      - kdelibs-dev installed
      - set KDE_INTEGRATION build flag
 
+  To build Gnome-Keyring plugin, you need
+     - libgnome-keyring-dev installed
+     - set GNOME_INTEGRATION build flag
+
   For debug build, gdb is required by qmake.
 
 MAC OS X
@@ -124,6 +128,12 @@ Available Defines
                           example:
                           $ export ENABLE_OPACITY_EFFECT="true"
 
+   DISABLE_UPDATES_CHECK  Disables option to check for updates at startup.
+                          (disabled by default)
+
+                          example:
+                          $ export DISABLE_UPDATES_CHECK="true"
+
 
  Windows specific defines:
 
diff --git a/src/defines.pri b/src/defines.pri
index 58cc36385..bcd47147a 100644
--- a/src/defines.pri
+++ b/src/defines.pri
@@ -10,10 +10,8 @@ mocinclude.CONFIG *= fix_target
 unix: VERSION = 1.7.0
 
 # Please read BUILD information #
-#DEFINES *= NO_SYSTEM_DATAPATH
-#DEFINES *= USE_WEBGL
-#DEFINES *= KDE
 #DEFINES *= PORTABLE_BUILD
+
 win32-msvc* {
     DEFINES *= W7API
     LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
@@ -74,6 +72,7 @@ d_nonblock_dialogs = $$(NONBLOCK_JS_DIALOGS)
 d_use_qtwebkit_2_2 = $$(USE_QTWEBKIT_2_2)
 d_use_lib_path = $$(USE_LIBPATH)
 d_disable_dbus = $$(DISABLE_DBUS)
+d_disable_updates_check = $$(DISABLE_UPDATES_CHECK)
 
 equals(d_no_system_datapath, "true") { DEFINES *= NO_SYSTEM_DATAPATH }
 equals(d_use_webgl, "true") { DEFINES *= USE_WEBGL }
@@ -88,6 +87,7 @@ equals(d_portable, "true") { DEFINES *= PORTABLE_BUILD }
 equals(d_nonblock_dialogs, "true") { DEFINES *= NONBLOCK_JS_DIALOGS }
 equals(d_use_qtwebkit_2_2, "true") { DEFINES *= USE_QTWEBKIT_2_2 }
 equals(d_disable_dbus, "true") { DEFINES *= DISABLE_DBUS }
+equals(d_disable_updates_check, "true") { DEFINES *= DISABLE_UPDATES_CHECK }
 
 !mac:unix {
     x86libpath = /usr/lib/i386-linux-gnu
diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
index 55bc1c97f..de7a034b7 100644
--- a/src/lib/app/mainapplication.cpp
+++ b/src/lib/app/mainapplication.cpp
@@ -293,9 +293,11 @@ MainApplication::MainApplication(int &argc, char** argv)
         int afterLaunch = settings.value("Web-URL-Settings/afterLaunch", 1).toInt();
         settings.setValue("SessionRestore/isRunning", true);
 
+#ifndef DISABLE_UPDATES_CHECK
         if (checkUpdates) {
             new Updater(qupzilla);
         }
+#endif
 
         backupSavedSessions();
 
diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index d400feb64..3bd23d53a 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -86,6 +86,10 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
     m_pluginsList = new PluginsManager(this);
     ui->pluginsFrame->addWidget(m_pluginsList);
 
+#ifdef DISABLE_CHECK_UPDATES
+    ui->checkUpdates->setVisible(false);
+#endif
+
     if (QIcon::themeName().toLower() == QLatin1String("oxygen")) {
         ui->listWidget->item(0)->setIcon(QIcon::fromTheme("preferences-desktop", QIcon(":/icons/preferences/preferences-desktop.png")));
         ui->listWidget->item(1)->setIcon(QIcon::fromTheme("format-stroke-color", QIcon(":/icons/preferences/application-x-theme.png")));