diff --git a/xespdlang.sty b/xespdlang.sty
index 339c45b..6ac27c9 100644
--- a/xespdlang.sty
+++ b/xespdlang.sty
@@ -35,10 +35,25 @@
 
 \ProcessOptions\relax
 
-\ifXESPD@given@encoding
-  \RequirePackage{inputenc}
+\RequirePackage{csquotes}
+\RequirePackage{ifxetex}
+\ifxetex
+  \RequirePackage{textcase}
+  \RequirePackage{xltxtra}
+  \RequirePackage{xunicode}
+  \RequirePackage{xecyr}
+  \RequirePackage{polyglossia}
+  \setmainlanguage{\XESPD@lang}
+  \let\cyr\relax
+  \setkeys{\XESPD@lang}{babelshorthands=true}
+  \setotherlanguage{english}
+\else
+  \RequirePackage{cmap}
+  \ifXESPD@given@encoding
+    \RequirePackage{inputenc}
+  \fi
+  \RequirePackage[\XESPD@lang]{babel}
 \fi
 
-\RequirePackage[\XESPD@lang]{babel}
 \input{xespd\XESPD@lang.def}