diff --git a/packages/security/openssl/build b/packages/security/openssl/build
index ac8ba3680a..aa607e0bd1 100755
--- a/packages/security/openssl/build
+++ b/packages/security/openssl/build
@@ -43,18 +43,30 @@ case $TARGET_ARCH in
 esac
 
 cd $PKG_BUILD
-./Configure \
-  --prefix=/usr \
-  --openssldir=/etc/ssl \
-  zlib-dynamic \
-  threads \
-  shared \
-  $TARGET
+./Configure --prefix=/usr \
+            --libdir=lib \
+            --openssldir=/etc/pki/tls \
+            --install_prefix="$SYSROOT_PREFIX" \
+            shared \
+            threads \
+            zlib-dynamic \
+            enable-camellia \
+            enable-seed \
+            enable-tlsext \
+            enable-rfc3779 \
+            enable-cms \
+            enable-md2 \
+            no-krb5 \
+            no-idea \
+            no-mdc2 \
+            no-rc5 \
+            no-ec \
+            no-ecdh \
+            no-ecdsa \
+            $TARGET
 
-$SED -i -e "s:-march=[-a-z0-9] ::" \
-        -e "s:-mcpu=[-a-z0-9] ::g" \
-        -e "s:-O[0-9]:$CFLAGS:" Makefile
-
-make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib all build-shared
-make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib do_linux-shared
-make CC=$CC LD=$LD RANLIB=$RANLIB LIBDIR=lib INSTALL_PREFIX=$SYSROOT_PREFIX install_sw
+make CC="$CC" \
+     AR="$AR r" \
+     RANLIB="$RANLIB" \
+     MAKEDEPPROG="$CC" \
+     depend all build-shared install
diff --git a/packages/security/openssl/install b/packages/security/openssl/install
index cd3c12be3b..b7c6bb703d 100755
--- a/packages/security/openssl/install
+++ b/packages/security/openssl/install
@@ -22,13 +22,15 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/etc/ssl
-  cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/etc/ssl
+mkdir -p $INSTALL/etc/pki/tls
+  cp -P $PKG_BUILD/apps/openssl.cnf $INSTALL/etc/pki/tls
+
+mkdir -p $INSTALL/usr/bin
+  cp -P $PKG_BUILD/apps/openssl $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/libcrypto.so* $INSTALL/usr/lib
   cp -P $PKG_BUILD/libssl.so* $INSTALL/usr/lib
 
-mkdir -p $INSTALL/usr/lib/ssl/engines
-  cp -P $PKG_BUILD/engines/*.so $INSTALL/usr/lib/ssl/engines
-#  cp -P $PKG_BUILD/engines/ccgost/*.so $INSTALL/usr/lib/ssl/engines
+mkdir -p $INSTALL/usr/lib/engines
+  cp -P $PKG_BUILD/engines/*.so $INSTALL/usr/lib/engines
diff --git a/packages/security/openssl/meta b/packages/security/openssl/meta
index dd47947f9f..8c5d6053f2 100644
--- a/packages/security/openssl/meta
+++ b/packages/security/openssl/meta
@@ -20,7 +20,6 @@
 
 PKG_NAME="openssl"
 PKG_VERSION="1.0.0e"
-#PKG_VERSION="0.9.8r"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"