diff --git a/jsk_spot_robot/jsk_spot_startup/CMakeLists.txt b/jsk_spot_robot/jsk_spot_startup/CMakeLists.txt
index 7552ce0555..689bead4e6 100644
--- a/jsk_spot_robot/jsk_spot_startup/CMakeLists.txt
+++ b/jsk_spot_robot/jsk_spot_startup/CMakeLists.txt
@@ -13,7 +13,7 @@ catkin_package()
 #############
 ## Install ##
 #############
-install(DIRECTORY auth config launch scripts services udev_rules template
+install(DIRECTORY auth config launch
    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
    USE_SOURCE_PERMISSIONS
 )
@@ -42,3 +42,23 @@ if(CATKIN_ENABLE_TESTING)
   roslint_python()
   roslint_add_test()
 endif()
+
+#############
+## Install ##
+#############
+file(GLOB_RECURSE SCRIPT_PROGRAMS node_scripts/*)
+foreach(SCRIPT_PROGRAM ${SCRIPT_PROGRAMS})
+  if("${SCRIPT_PROGRAM}" MATCHES ".*\\.py$")
+    catkin_install_python(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+  else()
+    install(PROGRAMS ${SCRIPT_PROGRAM} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/node_scripts)
+  endif()
+endforeach()
+
+install(DIRECTORY app config launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+  USE_SOURCE_PERMISSIONS)
+
+file(GLOB LISP_FILES *.l)
+install(FILES ${LISP_FILES} nao.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+
diff --git a/jsk_spot_robot/spoteus/CMakeLists.txt b/jsk_spot_robot/spoteus/CMakeLists.txt
index 1289e57fbd..23b23f0bcb 100644
--- a/jsk_spot_robot/spoteus/CMakeLists.txt
+++ b/jsk_spot_robot/spoteus/CMakeLists.txt
@@ -44,11 +44,12 @@ add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/spot.l
 add_custom_target(compile_spot ALL DEPENDS ${PROJECT_SOURCE_DIR}/spot.l)
 
 
-install(DIRECTORY euslisp test
+install(DIRECTORY demo test
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
   USE_SOURCE_PERMISSIONS)
 
-install(FILES spot.l spot-interface.l spot-util.l spot.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
+file(GLOB LISP_FILES *.l)
+install(FILES ${LISP_FILES} spot.yaml DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
 
 if(CATKIN_ENABLE_TESTING)
   find_package(catkin REQUIRED COMPONENTS rostest)