diff --git a/CMakeModules/installer.cmake b/CMakeModules/installer.cmake
index e4ca2b7e01f..1db19d96e2e 100644
--- a/CMakeModules/installer.cmake
+++ b/CMakeModules/installer.cmake
@@ -30,6 +30,11 @@ if(WIN32)
   set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
 elseif(APPLE)
   set(CPACK_GENERATOR "DragNDrop")
+elseif(RPM_PACKAGE)
+  set(CPACK_GENERATOR "RPM")
+  set(CPACK_RPM_PACKAGE_RELEASE 0)
+  set(CPACK_RPM_PACKAGE_LICENSE "MIT")
+  set(CPACK_RPM_PACKAGE_URL "https://github.com/EOSIO/eos")
 else()
   set(CPACK_GENERATOR "DEB")
   set(CPACK_DEBIAN_PACKAGE_RELEASE 0)
diff --git a/debian/postinst b/debian/postinst
index 42123695c90..8b5ec75687c 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -36,6 +36,10 @@ case "$1" in
       adduser --no-create-home --group --system ${USER}
     fi
     set -e
+    touch /var/log/${PACKAGE}
+    mkdir -p /var/lib/${PACKAGE}
+    mkdir -p /etc/${PACKAGE}
+    mkdir -p /etc/${PACKAGE}/node_00
     chown ${USER}:${GROUP} /var/log/${PACKAGE}
     chown ${USER}:${GROUP} /var/lib/${PACKAGE}
     chown ${USER}:${GROUP} /etc/${PACKAGE}
diff --git a/externals/binaryen b/externals/binaryen
index 16d641f62ab..05d80e0b6bb 160000
--- a/externals/binaryen
+++ b/externals/binaryen
@@ -1 +1 @@
-Subproject commit 16d641f62ab14df845c87a63efe4d991b508d19a
+Subproject commit 05d80e0b6bb7d7aa96f101cd537755222ee50a2a
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index b67c86b0ed8..78593706c7d 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -11,5 +11,6 @@ add_subdirectory( abi_generator )
 
 #turn these off for now
 set(BUILD_TESTS OFF CACHE BOOL "Build GTest-based tests")
+set(BUILD_TOOLS OFF CACHE BOOL "Build wabt tools")
 set(RUN_RE2C OFF CACHE BOOL "Run re2c")
 add_subdirectory( wabt )
diff --git a/libraries/builtins/CMakeLists.txt b/libraries/builtins/CMakeLists.txt
index 74417c65168..b12ab43eb76 100644
--- a/libraries/builtins/CMakeLists.txt
+++ b/libraries/builtins/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories( builtins PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
 install ( TARGETS
    builtins 
 
-   RUNTIME DESTINATION bin
-   LIBRARY DESTINATION lib
-   ARCHIVE DESTINATION lib
+   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
 )
diff --git a/libraries/wabt b/libraries/wabt
index 67381cbe17e..270e1f9ee63 160000
--- a/libraries/wabt
+++ b/libraries/wabt
@@ -1 +1 @@
-Subproject commit 67381cbe17e0ef87d40f3376e99aea7fff0fa0b1
+Subproject commit 270e1f9ee63004578c82a2fe594b81afd84c1631
diff --git a/libraries/wasm-jit/Source/Programs/CMakeLists.txt b/libraries/wasm-jit/Source/Programs/CMakeLists.txt
index 27a3aa427b4..27652fd2e4e 100644
--- a/libraries/wasm-jit/Source/Programs/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Programs/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(eosio-wast2wasm Assemble.cpp CLI.h)
 target_link_libraries(eosio-wast2wasm Logging IR WAST WASM)
 set_target_properties(eosio-wast2wasm PROPERTIES FOLDER Programs)
-INSTALL(TARGETS eosio-wast2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
+INSTALL(TARGETS eosio-wast2wasm DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 
 add_executable(Disassemble Disassemble.cpp CLI.h)
 target_link_libraries(Disassemble Logging IR WAST WASM)
diff --git a/libraries/wasm-jit/Source/WASM/CMakeLists.txt b/libraries/wasm-jit/Source/WASM/CMakeLists.txt
index d6b3da8458f..795cc037b11 100644
--- a/libraries/wasm-jit/Source/WASM/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/WASM/CMakeLists.txt
@@ -7,5 +7,5 @@ add_definitions(-DWEBASSEMBLY_API=DLL_EXPORT)
 target_link_libraries(WASM Logging IR)
 
 install(TARGETS WASM
-   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
+   ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
diff --git a/programs/cleos/CMakeLists.txt b/programs/cleos/CMakeLists.txt
index 2581a15bd4f..8ef17610965 100644
--- a/programs/cleos/CMakeLists.txt
+++ b/programs/cleos/CMakeLists.txt
@@ -40,7 +40,7 @@ target_link_libraries( ${CLI_CLIENT_EXECUTABLE_NAME}
 install( TARGETS
    ${CLI_CLIENT_EXECUTABLE_NAME}
 
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
 )
diff --git a/programs/keosd/CMakeLists.txt b/programs/keosd/CMakeLists.txt
index a332f8e26b1..d14a543d1a3 100644
--- a/programs/keosd/CMakeLists.txt
+++ b/programs/keosd/CMakeLists.txt
@@ -23,7 +23,7 @@ mas_sign(${KEY_STORE_EXECUTABLE_NAME})
 install( TARGETS
    ${KEY_STORE_EXECUTABLE_NAME}
 
-   RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
 )