diff --git a/dev-util/retdec/Manifest b/dev-util/retdec/Manifest
index e068c3184..893100869 100644
--- a/dev-util/retdec/Manifest
+++ b/dev-util/retdec/Manifest
@@ -1,2 +1,2 @@
-DIST retdec-3.1.tar.gz 2884221 BLAKE2B 390c44e98d6dc9a748f7b09417715c83aeb13d78d733a65b6be7c5a4b45627feb4bb030933613181dd8c98c89a1f22f1b0a3a289ea708ec32f6e00f94f7ae2b0 SHA512 a85dc2df1bcb0081459fd74eb8cf6c2f1226227b37ac494f094b49ba6b806b2bf53790727516f8bda99d387f02f5778b43b6e560477d5825ddcf210f91a5eb92
 DIST retdec-3.2.tar.gz 2886288 BLAKE2B 66a800e3aa25dae958c50a8f7a84d3effa9e21693da69ffb219bf3badb125c2e19e1a71e4e7117ddcf13856f5ebff9b5a74c4550e7c0896897a9e6f4aaab4d3b SHA512 774271d5d3a25070a5618563ff980a512bb91ff2d5febd8eceb6f29890ea145e9639a5b55f1170ec78e7c62fc1368cd542fd70c5b6f3c49fb3ae98d9a2380005
+DIST retdec-3.3.tar.gz 8489178 BLAKE2B b9c7f2b20141dc923a87aea17eaa4bfa75bfe6f3b22209ce78b43944b3036cde14d6293b1492fa2d51c7a17cf9343312680ef9d72024f1e26e3e6071c47a46bd SHA512 9516028891d327c61f6541e45c72186169ed2447dd674a7444a4bddccbafdb59541759c75eba92d090eb7c6c1ae5321ba765e916d2229af7a09b020d601ded52
diff --git a/dev-util/retdec/retdec-3.1.ebuild b/dev-util/retdec/retdec-3.3.ebuild
similarity index 61%
rename from dev-util/retdec/retdec-3.1.ebuild
rename to dev-util/retdec/retdec-3.3.ebuild
index 1ff31f4ac..f7dc1c6a9 100644
--- a/dev-util/retdec/retdec-3.1.ebuild
+++ b/dev-util/retdec/retdec-3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,11 +8,13 @@ inherit cmake-utils
 DESCRIPTION="RetDec is a retargetable machine-code decompiler based on LLVM."
 HOMEPAGE="https://github.com/avast-tl/retdec"
 SRC_URI="https://github.com/avast-tl/retdec/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+#FIXME: install-share.py
+#https://github.com/avast-tl/retdec-support/releases/download/2019-03-08/retdec-support_2019-03-08.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc external"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc system-libs"
 
 RDEPEND="|| ( app-arch/upx-ucl app-arch/upx-bin )
 	sys-devel/bc
@@ -21,43 +23,52 @@ RDEPEND="|| ( app-arch/upx-ucl app-arch/upx-bin )
 	dev-ruby/pkg-config
 	sys-apps/coreutils
 	sys-libs/zlib
-	sys-libs/ncurses:*
-
+	sys-libs/ncurses:*[tinfo]
 	dev-libs/libdwarf
+	dev-libs/capstone
+	dev-libs/openssl:0
+
+	system-libs? (
+		dev-libs/elfio
+		dev-libs/jsoncpp
+		sys-devel/llvm
+		dev-libs/rapidjson
+		dev-libs/tinyxml2
+	)
 
 	doc? ( media-gfx/graphviz
 		app-doc/doxygen )"
+
 DEPEND="${RDEPEND}
 	dev-util/cmake"
 
-#	dev-libs/jsoncpp
-#	dev-libs/rapidjson
-#	dev-libs/tinyxml2
-
 CMAKE_REMOVE_MODULES_LIST="FindJsoncpp FindRapidjson FindTynyxml2 FindLibdwarf FindOpenssl"
 
 src_prepare(){
 	#https://github.com/avast-tl/retdec/issues/357
-
 	#compile with system dwarf
 	sed "s|libdwarf|dwarf elf z|g" -i ./src/cpdetect/CMakeLists.txt
 	sed "s|libdwarf|dwarf elf z|g" -i ./src/dwarfparser/CMakeLists.txt
 
 	#FIXME: do not download files here
+	#https://github.com/avast/retdec/issues/356
 	#use system files
-#	sed "s|add_subdirectory(jsoncpp)|#add_subdirectory(jsoncpp)|g" -i ./deps/CMakeLists.txt
+#	sed '/add_subdirectory(jsoncpp)/d' -i ./deps/CMakeLists.txt
 #/data/notmpfs/portage/dev-util/retdec-3.1/work/retdec-3.1/include/retdec/config/base.h:16:10: fatal error: json/json.h: No such file or directory
 # #include <json/json.h>
 #	sed "s|add_subdirectory(rapidjson)|#add_subdirectory(rapidjson)|g" -i ./deps/CMakeLists.txt
 #	sed "s|add_subdirectory(tinyxml2)|#add_subdirectory(tinyxml2)|g" -i ./deps/CMakeLists.txt
-	sed "s|add_subdirectory(libdwarf)|#add_subdirectory(libdwarf)|g" -i ./deps/CMakeLists.txt
+#	sed '/add_subdirectory(llvm)/d' -i ./deps/CMakeLists.txt
 
-	sed "s|INSTALL_PATH=\"\$1\"|INSTALL_PATH=\"${D}\$1\"|g" -i ./cmake/install-share.sh
-	if use !external; then
-		sed "s|include(|#include(|g" -i ./CMakeLists.txt
-	fi
+	sed '/add_subdirectory(libdwarf)/d' -i ./deps/CMakeLists.txt
+	sed '/add_subdirectory(capstone)/d' -i ./deps/CMakeLists.txt
 
-	sed "s|OUT=\"\$3\"|OUT=\"${D}\$3\"|g" -i ./support/yara_patterns/tools/compile-yara.sh
+	sed "s|get_install_path(sys.argv)| \"${D}\" + get_install_path(sys.argv)|g" -i ./support/install-share.py
+	sed "s|output = os.path.join|output = \"${D}\" + os.path.join|g" -i ./support/install-yara.py
+
+#	if use system-libs; then
+#		sed '/add_subdirectory(deps)/d' -i ./CMakeLists.txt
+#	fi
 
 	cmake-utils_src_prepare
 	eapply_user
@@ -72,8 +83,8 @@ src_configure() {
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DRETDEC_FORCE_OPENSSL_BUILD=0
 	)
-
 	cmake-utils_src_configure
 }