diff --git a/jamspell/utils.cpp b/jamspell/utils.cpp
index 07ad2c7..19efe9a 100644
--- a/jamspell/utils.cpp
+++ b/jamspell/utils.cpp
@@ -32,7 +32,7 @@ void SaveFile(const std::string& fileName, const std::string& data) {
 }
 
 TTokenizer::TTokenizer()
-    : Locale("en_US.utf-8")
+    : Locale(std::locale::classic())
 {
 }
 
@@ -135,7 +135,7 @@ uint64_t GetCurrentTimeMs() {
     return ms.count();
 }
 
-static const std::locale GLocale("en_US.UTF-8");
+static const std::locale GLocale(std::locale::classic());
 static const std::ctype<wchar_t>& GWctype = std::use_facet<std::ctype<wchar_t>>(GLocale);
 
 void ToLower(std::wstring& text) {
diff --git a/setup.py b/setup.py
index b207806..84ebef8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,9 @@
 import os
 import sys
-from distutils.command.build import build
-from distutils.command.build_ext import build_ext
+from setuptools.command.build import build
+from setuptools.command.build_ext import build_ext
 from setuptools.command.install import install
-from distutils.spawn import find_executable
+from shutil import which as find_executable
 from setuptools import setup
 from setuptools.extension import Extension
 import subprocess