diff --git a/packages/x11/xserver/xorg-server/build b/packages/x11/xserver/xorg-server/build
index 477f3ba66d..a60d546ea3 100755
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@@ -76,7 +76,7 @@ cd $PKG_BUILD
             --with-int10=x86emu \
             --disable-ipv6 \
             --with-gnu-ld \
-            --with-sha1=libcrypto \
+            --with-sha1=libgcrypt \
             --with-os-vendor="OpenELEC.tv" \
             --with-module-dir=$XORG_PATH_MODULES \
             --with-xkb-path=$XORG_PATH_XKB \
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index 7231aec857..4db12f4f8d 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libpciaccess freetype openssl libX11 libXfont libdrm Mesa pixman udev"
-PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa-GL openssl freetype pixman fontsproto udev"
+PKG_DEPENDS="libpciaccess freetype libgcrypt libX11 libXfont libdrm Mesa pixman udev"
+PKG_BUILD_DEPENDS="toolchain util-macros font-util fontsproto randrproto renderproto scrnsaverproto videoproto inputproto xf86dgaproto xf86driproto xf86miscproto glproto libpciaccess libX11 libXfont libxkbfile libdrm Mesa-GL libgcrypt freetype pixman fontsproto udev"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/xserver"
 PKG_SHORTDESC="xorg-server: The Xorg X server"
diff --git a/packages/x11/xserver/xorg-server/patches/xorg-server-1.9.3-10_cache_xkbcomp_output_for_fast_start_up.patch b/packages/x11/xserver/xorg-server/xorg-server-1.9.3-10_cache_xkbcomp_output_for_fast_start_up.patch
similarity index 100%
rename from packages/x11/xserver/xorg-server/patches/xorg-server-1.9.3-10_cache_xkbcomp_output_for_fast_start_up.patch
rename to packages/x11/xserver/xorg-server/xorg-server-1.9.3-10_cache_xkbcomp_output_for_fast_start_up.patch