diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f24c9f4a0..55be51a5e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1112,6 +1112,8 @@ PRIVATE
 
 if (${CMAKE_GENERATOR} MATCHES "(Visual Studio|Xcode|Ninja)")
     set(output_folder ${CMAKE_BINARY_DIR})
+elseif((${CMAKE_GENERATOR} MATCHES "(Unix Makefiles)") AND DESKTOP_APP_SPECIAL_TARGET STREQUAL "")
+    set(output_folder ${CMAKE_BINARY_DIR}/bin)
 else()
     set(output_folder ${CMAKE_BINARY_DIR}/$<IF:$<CONFIG:Debug>,Debug,Release>)
 endif()
diff --git a/Telegram/configure.py b/Telegram/configure.py
index c97b60e9f..f54118584 100644
--- a/Telegram/configure.py
+++ b/Telegram/configure.py
@@ -27,6 +27,7 @@ if sys.platform == 'win32' and not 'COMSPEC' in os.environ:
 
 executePath = os.getcwd()
 scriptPath = os.path.dirname(os.path.realpath(__file__))
+scriptName = os.path.basename(scriptPath)
 
 arguments = sys.argv[1:]
 
@@ -50,5 +51,10 @@ if officialTarget != '':
                 arguments.append('-DTDESKTOP_API_ID=' + apiIdMatch.group(1))
             elif apiHashMatch:
                 arguments.append('-DTDESKTOP_API_HASH=' + apiHashMatch.group(1))
+    finish(run_cmake.run(scriptName, arguments))
 
-finish(run_cmake.run(os.path.basename(scriptPath), arguments))
+if 'linux' in sys.platform:
+    debugCode = run_cmake.run(scriptName, arguments, "Debug")
+    finish(debugCode if debugCode else run_cmake.run(scriptName, arguments, "Release"))
+else:
+    finish(run_cmake.run(scriptName, arguments))
diff --git a/cmake b/cmake
index 8776c5c26..1dd11ff72 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 8776c5c26ea2087da67a4f47d8393727d6572967
+Subproject commit 1dd11ff72a19f35b5d1bd45e0397e07d09b0a9fb