diff --git a/src/build_mozc.py b/src/build_mozc.py
index 0569377..8806565 100644
--- a/src/build_mozc.py
+++ b/src/build_mozc.py
@@ -339,9 +339,6 @@
   parser.add_option('--gypdir', dest='gypdir',
                     help='Specifies the location of GYP to be used.')
   parser.add_option('--noqt', action='store_true', dest='noqt', default=False)
-  parser.add_option('--qtdir', dest='qtdir',
-                    default=os.getenv('QTDIR', None),
-                    help='Qt base directory to be used.')
   parser.add_option('--version_file', dest='version_file',
                     help='use the specified version template file',
                     default='mozc_version_template.txt')
@@ -451,6 +448,11 @@
     # as follows.
     parser.add_option('--msvs_version', dest='msvs_version', default='2013',
                       help='Specifies the target MSVS version.')
+
+  if IsWindows() or IsMac():
+    parser.add_option('--qtdir', dest='qtdir',
+                      default=os.getenv('QTDIR', None),
+                      help='Qt base directory to be used.')
 
   return parser.parse_args(args, values)
 
@@ -673,19 +675,23 @@
 
   if options.noqt or target_platform in ['Android', 'NaCl']:
     gyp_options.extend(['-D', 'use_qt=NO'])
+    gyp_options.extend(['-D', 'qt_dir='])
+  elif options.target_platform == 'Linux':
+    gyp_options.extend(['-D', 'use_qt=YES'])
+    gyp_options.extend(['-D', 'qt_dir='])
+
+    # Check if Qt libraries are installed.
+    system_qt_found = PkgExists('QtCore >= 4.0', 'QtCore < 5.0',
+                                'QtGui >= 4.0', 'QtGui < 5.0')
+    if not system_qt_found:
+      PrintErrorAndExit('Qt4 is required to build GUI Tool. '
+                        'Specify --noqt to skip building GUI Tool.')
   else:
-    if options.target_platform == 'Linux' and not options.qtdir:
-      # Check if Qt libraries are installed.
-      system_qt_found = PkgExists('QtCore >= 4.0', 'QtCore < 5.0',
-                                  'QtGui >= 4.0', 'QtGui < 5.0')
-      if not system_qt_found:
-        PrintErrorAndExit('Qt4 is required to build GUI Tool. '
-                          'Specify --noqt to skip building GUI Tool.')
     gyp_options.extend(['-D', 'use_qt=YES'])
-  if options.qtdir:
-    gyp_options.extend(['-D', 'qt_dir=%s' % os.path.abspath(options.qtdir)])
-  else:
-    gyp_options.extend(['-D', 'qt_dir='])
+    if options.qtdir:
+      gyp_options.extend(['-D', 'qt_dir=%s' % os.path.abspath(options.qtdir)])
+    else:
+      gyp_options.extend(['-D', 'qt_dir='])
 
   if options.target_platform == 'Windows' and options.wix_dir:
     gyp_options.extend(['-D', 'use_wix=YES'])
diff --git a/src/gui/qt_libraries.gypi b/src/gui/qt_libraries.gypi
index 480417d..cc45083 100644
--- a/src/gui/qt_libraries.gypi
+++ b/src/gui/qt_libraries.gypi
@@ -36,12 +36,12 @@
 
   'variables': {
     'conditions': [
-      ['qt_dir', {
+      ['target_platform=="Linux"', {
+        'qt_cflags': ['<!@(pkg-config --cflags QtGui QtCore)'],
+        'qt_include_dirs': [],
+      }, 'qt_dir', {
         'qt_cflags': [],
         'qt_include_dirs': ['<(qt_dir)/include'],
-      }, 'target_platform=="Linux"', {
-        'qt_cflags': ['<!@(pkg-config --cflags QtGui QtCore)'],
-        'qt_include_dirs': [],
       }, {
         'qt_cflags': [],
         'qt_include_dirs': [],
@@ -110,28 +110,8 @@
       ]
     }],
     ['target_platform=="Linux"', {
-      'conditions': [
-        ['qt_dir', {
-          'libraries': [
-            '-L<(qt_dir)/lib',
-            '-lQtGui',
-            '-lQtCore',
-            # Supposing Qt libraries in qt_dir will be built as static libraries
-            # without support of pkg-config, we need to list all the
-            # dependencies of QtGui.
-            # See http://doc.qt.nokia.com/4.7/requirements-x11.html
-            # pthread library is removed because it must not be specific to Qt.
-            '<!@(pkg-config --libs-only-L --libs-only-l'
-            ' xrender xrandr xcursor xfixes xinerama fontconfig freetype2'
-            ' xi xt xext x11'
-            ' sm ice'
-            ' gobject-2.0)',
-          ],
-        }, {
-          'libraries': [
-            '<!@(pkg-config --libs QtGui QtCore)',
-          ],
-        }],
+      'libraries': [
+        '<!@(pkg-config --libs QtGui QtCore)',
       ],
     }],
     # Workarounds related with clang.
diff --git a/src/gui/qt_moc.gypi b/src/gui/qt_moc.gypi
index aa0403a..55f958c 100644
--- a/src/gui/qt_moc.gypi
+++ b/src/gui/qt_moc.gypi
@@ -33,10 +33,10 @@
 
   'variables': {
     'conditions': [
-      ['qt_dir', {
+      ['target_platform=="Linux"', {
+        'moc_path': '<!(pkg-config --variable=moc_location QtGui)',
+      }, 'qt_dir', {
         'moc_path': '<(qt_dir)/bin/moc<(EXECUTABLE_SUFFIX)',
-      }, 'target_platform=="Linux"', {
-        'moc_path': '<!(pkg-config --variable=moc_location QtGui)',
       }, {
         'moc_path': 'moc<(EXECUTABLE_SUFFIX)',
       }],
diff --git a/src/gui/qt_rcc.gypi b/src/gui/qt_rcc.gypi
index f6c1c06..1593462 100644
--- a/src/gui/qt_rcc.gypi
+++ b/src/gui/qt_rcc.gypi
@@ -33,11 +33,11 @@
 
   'variables': {
     'conditions': [
-      ['qt_dir', {
-        'rcc_path': '<(qt_dir)/bin/rcc<(EXECUTABLE_SUFFIX)',
-      }, 'target_platform=="Linux"', {
+      ['target_platform=="Linux"', {
         # seems that --variable=rcc_location is not supported
         'rcc_path': '<!(pkg-config --variable=exec_prefix QtGui)/bin/rcc',
+      }, 'qt_dir', {
+        'rcc_path': '<(qt_dir)/bin/rcc<(EXECUTABLE_SUFFIX)',
       }, {
         'rcc_path': 'rcc<(EXECUTABLE_SUFFIX)',
       }],
diff --git a/src/gui/qt_uic.gypi b/src/gui/qt_uic.gypi
index 4eb3d6a..4737a17 100644
--- a/src/gui/qt_uic.gypi
+++ b/src/gui/qt_uic.gypi
@@ -33,10 +33,10 @@
 
   'variables': {
     'conditions': [
-      ['qt_dir', {
+      ['target_platform=="Linux"', {
+        'uic_path': '<!(pkg-config --variable=uic_location QtGui)',
+      }, 'qt_dir', {
         'uic_path': '<(qt_dir)/bin/uic<(EXECUTABLE_SUFFIX)',
-      }, 'target_platform=="Linux"', {
-        'uic_path': '<!(pkg-config --variable=uic_location QtGui)',
       }, {
         'uic_path': 'uic<(EXECUTABLE_SUFFIX)',
       }],
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 6341f4f..fade2a8 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2442
+BUILD=2443
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.