diff --git a/disabled-packages/nodejs-lts/build.sh b/packages/nodejs-lts/build.sh
similarity index 100%
rename from disabled-packages/nodejs-lts/build.sh
rename to packages/nodejs-lts/build.sh
diff --git a/disabled-packages/nodejs-lts/deps-uv-uv.gyp.patch b/packages/nodejs-lts/deps-uv-uv.gyp.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/deps-uv-uv.gyp.patch
rename to packages/nodejs-lts/deps-uv-uv.gyp.patch
diff --git a/disabled-packages/nodejs-lts/fix-hardcoded-paths.patch b/packages/nodejs-lts/fix-hardcoded-paths.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/fix-hardcoded-paths.patch
rename to packages/nodejs-lts/fix-hardcoded-paths.patch
diff --git a/disabled-packages/nodejs-lts/lib-child_process.js.patch b/packages/nodejs-lts/lib-child_process.js.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/lib-child_process.js.patch
rename to packages/nodejs-lts/lib-child_process.js.patch
diff --git a/disabled-packages/nodejs-lts/lib-os.js.patch b/packages/nodejs-lts/lib-os.js.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/lib-os.js.patch
rename to packages/nodejs-lts/lib-os.js.patch
diff --git a/disabled-packages/nodejs-lts/node.gyp.patch b/packages/nodejs-lts/node.gyp.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/node.gyp.patch
rename to packages/nodejs-lts/node.gyp.patch
diff --git a/disabled-packages/nodejs-lts/npm-link-patch.patch b/packages/nodejs-lts/npm-link-patch.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/npm-link-patch.patch
rename to packages/nodejs-lts/npm-link-patch.patch
diff --git a/disabled-packages/nodejs-lts/src-cares_wrap.cc.patch b/packages/nodejs-lts/src-cares_wrap.cc.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/src-cares_wrap.cc.patch
rename to packages/nodejs-lts/src-cares_wrap.cc.patch
diff --git a/disabled-packages/nodejs-lts/src-node.cc.patch b/packages/nodejs-lts/src-node.cc.patch
similarity index 74%
rename from disabled-packages/nodejs-lts/src-node.cc.patch
rename to packages/nodejs-lts/src-node.cc.patch
index d748ef845..c9bb4bdfc 100644
--- a/disabled-packages/nodejs-lts/src-node.cc.patch
+++ b/packages/nodejs-lts/src-node.cc.patch
@@ -14,24 +14,6 @@ diff -u -r ../node-v4.0.0/src/node.cc ./src/node.cc
  #include <pwd.h>  // getpwnam()
  #include <grp.h>  // getgrnam()
  #endif
-@@ -1590,7 +1590,7 @@
- }
- 
- 
--#if defined(__POSIX__) && !defined(__ANDROID__)
-+#if defined(__POSIX__)
- 
- static const uid_t uid_not_found = static_cast<uid_t>(-1);
- static const gid_t gid_not_found = static_cast<gid_t>(-1);
-@@ -1910,7 +1910,7 @@
-   }
- }
- 
--#endif  // __POSIX__ && !defined(__ANDROID__)
-+#endif  // __POSIX__
- 
- 
- void Exit(const FunctionCallbackInfo<Value>& args) {
 @@ -2866,7 +2866,7 @@
  
    env->SetMethod(process, "umask", Umask);
diff --git a/packages/nodejs-lts/src-node_internals.h.patch b/packages/nodejs-lts/src-node_internals.h.patch
new file mode 100644
index 000000000..fb5287471
--- /dev/null
+++ b/packages/nodejs-lts/src-node_internals.h.patch
@@ -0,0 +1,21 @@
+diff -u -r ../node-v8.12.0/src/node_internals.h ./src/node_internals.h
+--- ../node-v8.12.0/src/node_internals.h	2018-09-10 18:47:03.000000000 +0000
++++ ./src/node_internals.h	2018-09-18 03:11:24.361303054 +0000
+@@ -433,7 +433,7 @@
+ void Umask(const v8::FunctionCallbackInfo<v8::Value>& args);
+ void Uptime(const v8::FunctionCallbackInfo<v8::Value>& args);
+ 
+-#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)
++#if defined(__POSIX__) && !defined(__CloudABI__)
+ void SetGid(const v8::FunctionCallbackInfo<v8::Value>& args);
+ void SetEGid(const v8::FunctionCallbackInfo<v8::Value>& args);
+ void SetUid(const v8::FunctionCallbackInfo<v8::Value>& args);
+@@ -445,7 +445,7 @@
+ void GetEUid(const v8::FunctionCallbackInfo<v8::Value>& args);
+ void GetEGid(const v8::FunctionCallbackInfo<v8::Value>& args);
+ void GetGroups(const v8::FunctionCallbackInfo<v8::Value>& args);
+-#endif  // __POSIX__ && !defined(__ANDROID__) && !defined(__CloudABI__)
++#endif  // __POSIX__ && !defined(__CloudABI__)
+ 
+ }  // namespace node
+ 
diff --git a/disabled-packages/nodejs-lts/src-node_main.cc.patch b/packages/nodejs-lts/src-node_main.cc.patch
similarity index 100%
rename from disabled-packages/nodejs-lts/src-node_main.cc.patch
rename to packages/nodejs-lts/src-node_main.cc.patch
diff --git a/packages/nodejs-lts/src-node_process.cc.patch b/packages/nodejs-lts/src-node_process.cc.patch
new file mode 100644
index 000000000..6a1f2fe1f
--- /dev/null
+++ b/packages/nodejs-lts/src-node_process.cc.patch
@@ -0,0 +1,29 @@
+diff -u -r ../node-v8.12.0/src/node_process.cc ./src/node_process.cc
+--- ../node-v8.12.0/src/node_process.cc	2018-09-10 18:47:03.000000000 +0000
++++ ./src/node_process.cc	2018-09-18 02:59:20.057281174 +0000
+@@ -22,7 +22,7 @@
+ #include <unistd.h>  // setuid, getuid
+ #endif
+ 
+-#if defined(__POSIX__) && !defined(__ANDROID__) && !defined(__CloudABI__)
++#if defined(__POSIX__) && !defined(__CloudABI__)
+ #include <pwd.h>  // getpwnam()
+ #include <grp.h>  // getgrnam()
+ #endif
+@@ -236,7 +236,7 @@
+ }
+ 
+ 
+-#if defined(__POSIX__) && !defined(__ANDROID__)
++#if defined(__POSIX__)
+ 
+ static const uid_t uid_not_found = static_cast<uid_t>(-1);
+ static const gid_t gid_not_found = static_cast<gid_t>(-1);
+@@ -555,6 +555,6 @@
+   }
+ }
+ 
+-#endif  // __POSIX__ && !defined(__ANDROID__)
++#endif  // __POSIX__
+ 
+ }  // namespace node
diff --git a/packages/nodejs/build.sh b/packages/nodejs/build.sh
index 4fbcf0b98..d654be723 100644
--- a/packages/nodejs/build.sh
+++ b/packages/nodejs/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://nodejs.org/
 TERMUX_PKG_DESCRIPTION="Platform built on Chrome's JavaScript runtime for easily building fast, scalable network applications"
 TERMUX_PKG_VERSION=10.10.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=860eff976d83dd619849c0b4fab4cadb093ece2c718aaa5af8fb5ebbfa7d8a80
 TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_PKG_VERSION}.tar.xz
 # Note that we do not use a shared libuv to avoid an issue with the Android
@@ -10,7 +10,7 @@ TERMUX_PKG_SRCURL=https://nodejs.org/dist/v${TERMUX_PKG_VERSION}/node-v${TERMUX_
 TERMUX_PKG_DEPENDS="openssl, c-ares, libicu"
 TERMUX_PKG_RM_AFTER_INSTALL="lib/node_modules/npm/html lib/node_modules/npm/make.bat share/systemtap lib/dtrace"
 TERMUX_PKG_BUILD_IN_SRC=yes
-TERMUX_PKG_CONFLICTS="nodejs-current"
+TERMUX_PKG_CONFLICTS="nodejs-lts, nodejs-current"
 TERMUX_PKG_REPLACES="nodejs-current"
 
 termux_step_configure () {
diff --git a/packages/yarn/build.sh b/packages/yarn/build.sh
index b528ea5b2..dad763863 100644
--- a/packages/yarn/build.sh
+++ b/packages/yarn/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://yarnpkg.com/
 TERMUX_PKG_DESCRIPTION="Fast, reliable, and secure dependency management"
 TERMUX_PKG_MAINTAINER="Pierre Rudloff @Rudloff"
-TERMUX_PKG_DEPENDS="nodejs"
+TERMUX_PKG_DEPENDS="nodejs | nodejs-lts"
 TERMUX_PKG_VERSION=1.9.4
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=7667eb715077b4bad8e2a832e7084e0e6f1ba54d7280dc573c8f7031a7fb093e
 TERMUX_PKG_SRCURL=https://yarnpkg.com/downloads/${TERMUX_PKG_VERSION}/yarn-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes