diff --git a/build.html b/build.html
index 5b81fe5..7c31d38 100644
--- a/build.html
+++ b/build.html
@@ -60,7 +60,7 @@ select.large { font-size: large; }
     <div id="buildCompilerDiv" class="hide">
       <span>Choose which compiler you want to use to build the Telegram Bot API server:</span><br>
       <label><input type="radio" id="buildCompilerRadioGcc" name="buildCompilerRadio" onchange="onOptionsChanged()" checked/>g++</label>
-      <label><input type="radio" id="buildCompilerRadioClang" name="buildCompilerRadio" onchange="onOptionsChanged()"/>clang++ (recommended)</label>
+      <label><input type="radio" id="buildCompilerRadioClang" name="buildCompilerRadio" onchange="onOptionsChanged()"/>clang (recommended)</label>
       <p></p>
     </div>
 
@@ -252,7 +252,7 @@ function onOptionsChanged() {
     pre_text.push('Download and install <a href="https://sourceforge.net/projects/gnuwin32/files/gperf/3.0.1/">gperf</a>. Add the path to gperf.exe to the PATH environment variable.');
   }
   if (os_linux && linux_distro === 'Other') {
-    var compiler = use_clang ? 'clang++ >= 3.4' : 'g++ >= 4.9.2';
+    var compiler = use_clang ? 'clang >= 3.4' : 'g++ >= 4.9.2';
     pre_text.push('Install Git, ' + compiler + ', make, CMake >= 3.0.2, OpenSSL-dev, zlib-dev, gperf using your package manager.');
   }
   if (os_freebsd) {
@@ -436,34 +436,6 @@ function onOptionsChanged() {
   commands.push('mkdir build');
   commands.push('cd build');
 
-  if (!use_msvc) {
-    var c_flags = [];
-    var cxx_flags = [];
-
-    if (build_32bit) {
-      c_flags.push('-m32');
-      cxx_flags.push('-m32');
-    } else if (build_64bit) {
-      c_flags.push('-m64');
-      cxx_flags.push('-m64');
-    }
-
-    if (os_linux) {
-      if (use_clang) {
-        cxx_flags.push('-stdlib=libc++');
-      } else {
-        cxx_flags.push('');
-      }
-    }
-
-    if (c_flags.length) {
-      commands.push('export CFLAGS="' + c_flags.join(' ') + '"');
-    }
-    if (cxx_flags.length) {
-      commands.push('export CXXFLAGS="' + cxx_flags.join(' ') + '"');
-    }
-  }
-
   cmake_init_options = getBacicCmakeInitOptions();
   if (os_mac) {
     cmake_init_options.push('-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/');
@@ -478,7 +450,7 @@ function onOptionsChanged() {
     if (os_linux) {
       if (use_clang) {
         var clang_version_suffix = getClangVersionSuffix();
-        prefix = 'CC=/usr/bin/clang' + clang_version_suffix + ' CXX=/usr/bin/clang++' + clang_version_suffix + ' ';
+        prefix = 'CXXFLAGS="-stdlib=libc++" CC=/usr/bin/clang' + clang_version_suffix + ' CXX=/usr/bin/clang++' + clang_version_suffix + ' ';
       } else if (linux_distro === 'Ubuntu 14') {
         prefix = 'CC=/usr/bin/gcc-4.9 CXX=/usr/bin/g++-4.9 ';
       } else if (linux_distro === 'CentOS 7') {
diff --git a/td b/td
index 6f28ad3..604df72 160000
--- a/td
+++ b/td
@@ -1 +1 @@
-Subproject commit 6f28ad36af1435b6de46551b21278a3579c7e367
+Subproject commit 604df72790eab24ebe5ae8154e2e077f0f915951