diff --git a/cjdns.sign.patch b/cjdns.sign.patch
index 971f239..3b36ea4 100644
--- a/cjdns.sign.patch
+++ b/cjdns.sign.patch
@@ -1,6 +1,6 @@
 diff -up ./crypto/Sign.c.sign ./crypto/Sign.c
---- ./crypto/Sign.c.sign	2016-10-13 21:41:54.994262245 -0400
-+++ ./crypto/Sign.c	2016-10-14 20:51:33.395789629 -0400
+--- ./crypto/Sign.c.sign	2016-10-11 17:39:44.000000000 -0400
++++ ./crypto/Sign.c	2016-10-14 20:59:49.143754098 -0400
 @@ -13,6 +13,7 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
@@ -8,17 +8,17 @@ diff -up ./crypto/Sign.c.sign ./crypto/Sign.c
 +#ifdef SUBNODE
  #include "crypto/Sign.h"
  
- //#include "node_build/dependencies/cnacl/crypto_sign/ed25519/ref10/ge.h"
+ #include "node_build/dependencies/cnacl/crypto_sign/ed25519/ref10/ge.h"
 @@ -110,3 +111,6 @@ int Sign_publicSigningKeyToCurve25519(ui
  
      return 0;
  }
 +#else
 +#pragma GCC diagnostic ignored "-Wpedantic"
-+#endif  // SUBNODE
++#endif // SUBNODE
 diff -up ./crypto/test/Sign_test.c.sign ./crypto/test/Sign_test.c
---- ./crypto/test/Sign_test.c.sign	2016-10-14 20:29:19.334704236 -0400
-+++ ./crypto/test/Sign_test.c	2016-10-14 20:52:31.415488510 -0400
+--- ./crypto/test/Sign_test.c.sign	2016-10-11 17:39:44.000000000 -0400
++++ ./crypto/test/Sign_test.c	2016-10-14 20:57:28.737064976 -0400
 @@ -23,6 +23,7 @@
  
  int main()
diff --git a/cjdns.spec b/cjdns.spec
index 9968f4d..05986b3 100644
--- a/cjdns.spec
+++ b/cjdns.spec
@@ -2,9 +2,11 @@
 # Fedora review: http://bugzilla.redhat.com/1268716
 
 # Use the optimized libnacl embedded with cjdns
-%global use_embedded 1
+%global use_embedded 0
 # Use libsodium instead of nacl
-%global use_libsodium 0
+%global use_libsodium 1
+# Option to enable SUBNODE mode (WIP)
+%bcond_with subnode
 # Option to disable SECCOMP: confusing backward logic
 %bcond_without seccomp
 
@@ -41,7 +43,7 @@
 Name:           cjdns
 # major version is cjdns protocol version:
 Version:        18
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The privacy-friendly network without borders
 Group:          System Environment/Base
 # cjdns is all GPLv3 except libuv which is MIT and BSD and ISC
@@ -86,6 +88,8 @@ Patch9:  cjdns.man.patch
 Patch10: cjdns.tools.patch
 # Alternate dynamic library patch to use libsodium
 Patch11: cjdns.sodium.patch
+# Disable WIP subnode code when SUBNODE not enabled
+Patch12: cjdns.sign.patch
 
 BuildRequires:  nodejs, nodejs-ronn
 
@@ -190,6 +194,7 @@ elif test -d %{_includedir}/nacl && test -r %{_libdir}/libnacl.a; then
   ln -s %{_includedir}/nacl cnacl/jsbuild/include
   cd -
 fi
+%patch12 -b .sign
 %endif
 
 %if !0%{?rhel} || 0%{?rhel} > 6
@@ -477,6 +482,10 @@ fi
 %{_bindir}/graphStats
 
 %changelog
+* Fri Oct 14 2016 Stuart D. Gathman <stuart@gathman.org> 18-2
+- Remove Sign.c which uses a private API and isn't needed until supernodes.
+- Use libsodium by default: seems best performance of dynamic libraries
+
 * Wed Oct 12 2016 Stuart D. Gathman <stuart@gathman.org> 18-1
 - Update to 18 upstream release