diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac0dbe70dd..c82910708a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,16 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
   message( FATAL_ERROR "FATAL: In-source builds are not allowed. You should create a separate directory for build files and delete CMakeCache.txt." )
 endif()
 
+if (COMMAND TRIBITS_PACKAGE_DECL)
+  TRIBITS_PACKAGE_DECL(Kokkos)
+endif()
+
 # We want to determine if options are given with the wrong case
 # In order to detect which arguments are given to compare against
 # the list of valid arguments, at the beginning here we need to
 # form a list of all the given variables. If it begins with any
 # case of KoKkOS, we add it to the list.
 
-
 GET_CMAKE_PROPERTY(_variableNames VARIABLES)
 SET(KOKKOS_GIVEN_VARIABLES)
 FOREACH (var ${_variableNames})
@@ -123,6 +126,8 @@ IF(NOT KOKKOS_HAS_TRILINOS)
           FORCE)
     ENDIF()
   ENDIF()
+ELSE()
+  SET(KOKKOS_COMPILE_LANGUAGE CXX)
 ENDIF()
 
 IF (NOT CMAKE_SIZEOF_VOID_P)
@@ -289,7 +294,9 @@ IF (KOKKOS_HAS_TRILINOS)
     $<$<COMPILE_LANGUAGE:CXX>:${KOKKOS_ALL_COMPILE_OPTIONS}>)
 ENDIF()
 
-KOKKOS_PACKAGE_DECL()
+if (NOT COMMAND TRIBITS_PACKAGE_DECL)
+  KOKKOS_PACKAGE_DECL()
+endif()
 
 
 #------------------------------------------------------------------------------
diff --git a/cmake/kokkos_functions.cmake b/cmake/kokkos_functions.cmake
index 4c51bdeabf..55b1ebbf81 100644
--- a/cmake/kokkos_functions.cmake
+++ b/cmake/kokkos_functions.cmake
@@ -5,6 +5,9 @@
 # Validate options are given with correct case and define an internal
 # upper-case version for use within
 
+set(Kokkos_OPTIONS_NOT_TO_EXPORT
+  Kokkos_ENABLE_TESTS  Kokkos_ENABLE_EXAMPLES)
+
 #
 #
 # @FUNCTION: kokkos_deprecated_list
@@ -57,6 +60,12 @@ FUNCTION(kokkos_option CAMEL_SUFFIX DEFAULT TYPE DOCSTRING)
   # Make sure this appears in the cache with the appropriate DOCSTRING
   SET(${CAMEL_NAME} ${DEFAULT} CACHE ${TYPE} ${DOCSTRING})
 
+  IF (KOKKOS_HAS_TRILINOS)
+    IF (NOT CAMEL_NAME IN_LIST Kokkos_OPTIONS_NOT_TO_EXPORT)
+      TRIBITS_PKG_EXPORT_CACHE_VAR(${CAMEL_NAME})
+    ENDIF()
+  ENDIF()
+
   #I don't love doing it this way because it's N^2 in number options, but c'est la vie
   FOREACH(opt ${KOKKOS_GIVEN_VARIABLES})
     STRING(TOUPPER ${opt} OPT_UC)
diff --git a/cmake/kokkos_tribits.cmake b/cmake/kokkos_tribits.cmake
index 0557db2098..0f39551423 100644
--- a/cmake/kokkos_tribits.cmake
+++ b/cmake/kokkos_tribits.cmake
@@ -353,6 +353,7 @@ MACRO(KOKKOS_INSTALL_ADDITIONAL_FILES)
           DESTINATION ${KOKKOS_HEADER_DIR})
 ENDMACRO()
 
+
 FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
   CMAKE_PARSE_ARGUMENTS(PARSE
     "PLAIN_STYLE"
@@ -441,6 +442,7 @@ FUNCTION(KOKKOS_SET_LIBRARY_PROPERTIES LIBRARY_NAME)
   ENDIF()
 ENDFUNCTION()
 
+
 FUNCTION(KOKKOS_INTERNAL_ADD_LIBRARY LIBRARY_NAME)
   CMAKE_PARSE_ARGUMENTS(PARSE
     "STATIC;SHARED"
@@ -503,19 +505,11 @@ FUNCTION(KOKKOS_ADD_LIBRARY LIBRARY_NAME)
     # preserving the directory structure, e.g. impl
     # If headers got installed in both locations, it breaks some
     # downstream packages
-    TRIBITS_ADD_LIBRARY(${LIBRARY_NAME} ${PARSE_UNPARSED_ARGUMENTS})
-    #Stolen from Tribits - it can add prefixes
-    SET(TRIBITS_LIBRARY_NAME_PREFIX "${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}")
-    SET(TRIBITS_LIBRARY_NAME ${TRIBITS_LIBRARY_NAME_PREFIX}${LIBRARY_NAME})
-    #Tribits has way too much techinical debt and baggage to even
-    #allow PUBLIC target_compile_options to be used. It forces C++ flags on projects
-    #as a giant blob of space-separated strings. We end up with duplicated
-    #flags between the flags implicitly forced on Kokkos-dependent and those Kokkos
-    #has in its public INTERFACE_COMPILE_OPTIONS.
-    #These do NOT get de-deduplicated because Tribits
-    #creates flags as a giant monolithic space-separated string
-    #Do not set any transitive properties and keep everything working as before
-    #KOKKOS_SET_LIBRARY_PROPERTIES(${TRIBITS_LIBRARY_NAME} PLAIN_STYLE)
+    TRIBITS_ADD_LIBRARY(${LIBRARY_NAME} ${PARSE_UNPARSED_ARGUMENTS}
+      ADDED_LIB_TARGET_NAME_OUT  ${LIBRARY_NAME}_TARGET_NAME )
+    IF (PARSE_ADD_BUILD_OPTIONS)
+      KOKKOS_SET_LIBRARY_PROPERTIES(${${LIBRARY_NAME}_TARGET_NAME})
+    ENDIF()
   ELSE()
     # Forward the headers, we want to know about all headers
     # to make sure they appear correctly in IDEs
@@ -527,15 +521,17 @@ FUNCTION(KOKKOS_ADD_LIBRARY LIBRARY_NAME)
   ENDIF()
 ENDFUNCTION()
 
+
 FUNCTION(KOKKOS_ADD_INTERFACE_LIBRARY NAME)
-IF (KOKKOS_HAS_TRILINOS)
-  TRIBITS_ADD_LIBRARY(${NAME} ${ARGN})
-ELSE()
-  ADD_LIBRARY(${NAME} INTERFACE)
-  KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL(${NAME})
-ENDIF()
+  IF (KOKKOS_HAS_TRILINOS)
+    TRIBITS_ADD_LIBRARY(${NAME} ${ARGN})
+  ELSE()
+    ADD_LIBRARY(${NAME} INTERFACE)
+    KOKKOS_INTERNAL_ADD_LIBRARY_INSTALL(${NAME})
+  ENDIF()
 ENDFUNCTION()
 
+
 FUNCTION(KOKKOS_LIB_INCLUDE_DIRECTORIES TARGET)
   IF(KOKKOS_HAS_TRILINOS)
     #ignore the target, tribits doesn't do anything directly with targets
@@ -549,13 +545,8 @@ FUNCTION(KOKKOS_LIB_INCLUDE_DIRECTORIES TARGET)
 ENDFUNCTION()
 
 FUNCTION(KOKKOS_LIB_COMPILE_OPTIONS TARGET)
-  IF(KOKKOS_HAS_TRILINOS)
-    #don't trust tribits to do this correctly
-    KOKKOS_TARGET_COMPILE_OPTIONS(${TARGET} ${ARGN})
-  ELSE()
-    KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
-    KOKKOS_TARGET_COMPILE_OPTIONS(${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${TARGET} ${INCTYPE} ${ARGN})
-  ENDIF()
+  KOKKOS_LIB_TYPE(${TARGET} INCTYPE)
+  KOKKOS_TARGET_COMPILE_OPTIONS(${${PROJECT_NAME}_LIBRARY_NAME_PREFIX}${TARGET} ${INCTYPE} ${ARGN})
 ENDFUNCTION()
 
 MACRO(KOKKOS_ADD_TEST_DIRECTORIES)