diff --git a/.github/workflows/build.yml b/.github/workflows/build-linux.yml
similarity index 74%
rename from .github/workflows/build.yml
rename to .github/workflows/build-linux.yml
index 5d66e51..7b0d112 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build-linux.yml
@@ -1,7 +1,7 @@
 # .github/workflows/build.yml
-# Last modified: 29-Jun-2021 (kobayasy)
+# Last modified: 10-Jul-2021 (kobayasy)
 
-name: Build
+name: Linux
 
 on:
   push:
@@ -9,13 +9,9 @@ on:
       - master
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - macos-latest
-    runs-on: ${{ matrix.os }}
+  build:
+    name: Build
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
new file mode 100644
index 0000000..21955b9
--- /dev/null
+++ b/.github/workflows/build-macos.yml
@@ -0,0 +1,31 @@
+# .github/workflows/build.yml
+# Last modified: 10-Jul-2021 (kobayasy)
+
+name: macOS
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    name: Build
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build and install
+        run: |
+          mkdir build
+          cd build
+          ../src/configure --prefix=$HOME
+          make install distclean
+          cd ..
+          rmdir build
+      - name: Run
+        run: |
+          mkdir -m700 ~/pSync
+          echo 'psync pSync' > ~/.psync.conf
+          chmod 600 ~/.psync.conf
+          ~/bin/psync --help
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index 6bb5e1e..8500b44 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -1,7 +1,7 @@
 # .github/workflows/build-windows.yml
-# Last modified: 04-Jul-2021 (kobayasy)
+# Last modified: 10-Jul-2021 (kobayasy)
 
-name: Build-windows
+name: Windows
 
 on:
   push:
@@ -9,12 +9,9 @@ on:
       - master
 
 jobs:
-  test:
-    strategy:
-      matrix:
-        os:
-          - windows-latest
-    runs-on: ${{ matrix.os }}
+  build:
+    name: Build
+    runs-on: windows-latest
     defaults:
       run:
         shell: msys2 {0}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4803520..07893cf 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
 # .github/workflows/release.yml
-# Last modified: 01-Jul-2021 (kobayasy)
+# Last modified: 10-Jul-2021 (kobayasy)
 
 name: Release
 
@@ -10,11 +10,8 @@ on:
 
 jobs:
   dist:
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-    runs-on: ${{ matrix.os }}
+    name: Dist
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/README_en.md b/README_en.md
index d243ac9..7b0edc1 100644
--- a/README_en.md
+++ b/README_en.md
@@ -1,7 +1,8 @@
 [[Japanese/日本語](README_ja.md)]
 
-[![Build](https://github.com/kobayasy/pSync/workflows/Build/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build.yml)
-[![CodeQL](https://github.com/kobayasy/pSync/workflows/CodeQL/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/codeql-analysis.yml)
+[![Linux](https://github.com/kobayasy/pSync/workflows/Linux/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-linux.yml)
+[![macOS](https://github.com/kobayasy/pSync/workflows/macOS/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-macos.yml)
+[![Windows](https://github.com/kobayasy/pSync/workflows/Windows/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-windows.yml)
 
 <div align="center"><img src="psync.png" alt="pSync"></div>
 
@@ -13,9 +14,9 @@ So for this to work, you must be able to login to the sync-host with [OpenSSH].
 This work is required for each sync-host include local-host.  
 1. Do the following to build and install.  
 ```
-curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.8/psync-2.8.tar.gz
-tar xzf psync-2.8.tar.gz
-cd psync-2.8
+curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.9/psync-2.9.tar.gz
+tar xzf psync-2.9.tar.gz
+cd psync-2.9
 ./configure --prefix=$HOME
 make install
 ```
diff --git a/README_ja.md b/README_ja.md
index 12d9512..80ed1df 100644
--- a/README_ja.md
+++ b/README_ja.md
@@ -1,7 +1,8 @@
 [[英語/English](README_en.md)] [[使い方のヒント](NOTE_ja.md)]
 
-[![Build](https://github.com/kobayasy/pSync/workflows/Build/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build.yml)
-[![CodeQL](https://github.com/kobayasy/pSync/workflows/CodeQL/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/codeql-analysis.yml)
+[![Linux](https://github.com/kobayasy/pSync/workflows/Linux/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-linux.yml)
+[![macOS](https://github.com/kobayasy/pSync/workflows/macOS/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-macos.yml)
+[![Windows](https://github.com/kobayasy/pSync/workflows/Windows/badge.svg)](https://github.com/kobayasy/pSync/actions/workflows/build-windows.yml)
 
 <div align="center"><img src="psync.png" alt="pSync"></div>
 
@@ -13,9 +14,9 @@
 ローカルホストを含めた全ての同期ホストに対してこの作業が必要です。  
 1. 以下の手順でビルドとインストールを行ないます。  
 ```
-curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.8/psync-2.8.tar.gz
-tar xzf psync-2.8.tar.gz
-cd psync-2.8
+curl -LOJs https://github.com/kobayasy/pSync/releases/download/2.9/psync-2.9.tar.gz
+tar xzf psync-2.9.tar.gz
+cd psync-2.9
 ./configure --prefix=$HOME
 make install
 ```
diff --git a/psync.png b/psync.png
index 45d3b4b..4694e42 100644
Binary files a/psync.png and b/psync.png differ
diff --git a/src/Makefile.in b/src/Makefile.in
index 5e8bbc3..8926c52 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 # @configure_input@
-# Makefile.in - Last modified: 28-Jun-2021 (kobayasy)
+# Makefile.in - Last modified: 10-Jul-2021 (kobayasy)
 #
 # Copyright (c) 2018-2021 by Yuichi Kobayashi <kobayasy@kobayasy.com>
 #
@@ -25,8 +25,8 @@
 
 TARGET = @PACKAGE_TARNAME@@EXEEXT@
 OBJS = psync.@OBJEXT@ psync_psp1.@OBJEXT@ popen3.@OBJEXT@ main.@OBJEXT@
-MAN1JA = @PACKAGE_TARNAME@.1
-MAN5JA = @PACKAGE_TARNAME@.conf.5
+MAN1JA = ja/@PACKAGE_TARNAME@.1
+MAN5JA = ja/@PACKAGE_TARNAME@.conf.5
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -36,7 +36,6 @@ mandir = @mandir@
 
 CC = @CC@
 CFLAGS  = @CFLAGS@
-CFLAGS += -I.
 #CFLAGS += -Wall
 #CFLAGS += -Wno-shift-count-overflow
 #CFLAGS += -Wno-string-plus-int
diff --git a/src/README.txt b/src/README.txt
index 9ff6561..c0d38e6 100644
--- a/src/README.txt
+++ b/src/README.txt
@@ -6,8 +6,8 @@ Installation:
 This work is required for each sync-host include local-host.
 1. Do the following to build and install.
 ---
-tar xzf psync-2.8.tar.gz
-cd psync-2.8
+tar xzf psync-2.9.tar.gz
+cd psync-2.9
 ./configure --prefix=$HOME
 make install
 ---
diff --git a/src/config.h.in b/src/config.h.in
index 0ab77ab..b703876 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+#ifndef _INCLUDE_config_h
+#define _INCLUDE_config_h
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -77,3 +80,5 @@
 
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
+
+#endif  /* #ifndef _INCLUDE_config_h */
diff --git a/src/configure b/src/configure
index 5a92f33..74ba376 100755
--- a/src/configure
+++ b/src/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pSync 2.8.
+# Generated by GNU Autoconf 2.69 for pSync 2.9.
 #
 # Report bugs to <kobayasy@kobayasy.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pSync'
 PACKAGE_TARNAME='psync'
-PACKAGE_VERSION='2.8'
-PACKAGE_STRING='pSync 2.8'
+PACKAGE_VERSION='2.9'
+PACKAGE_STRING='pSync 2.9'
 PACKAGE_BUGREPORT='kobayasy@kobayasy.com'
 PACKAGE_URL='http://kobayasy.com/psync/'
 
@@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pSync 2.8 to adapt to many kinds of systems.
+\`configure' configures pSync 2.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1307,7 +1307,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pSync 2.8:";;
+     short | recursive ) echo "Configuration of pSync 2.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1394,7 +1394,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pSync configure 2.8
+pSync configure 2.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1763,7 +1763,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pSync $as_me 2.8, which was
+It was created by pSync $as_me 2.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2962,6 +2962,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+as_fn_append CFLAGS ' -I.'
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -4251,6 +4252,8 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_headers="$ac_config_headers config.h"
 
+
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -4757,7 +4760,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pSync $as_me 2.8, which was
+This file was extended by pSync $as_me 2.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4820,7 +4823,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pSync config.status 2.8
+pSync config.status 2.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/src/psync.1 b/src/ja/psync.1
similarity index 100%
rename from src/psync.1
rename to src/ja/psync.1
diff --git a/src/psync.conf.5 b/src/ja/psync.conf.5
similarity index 100%
rename from src/psync.conf.5
rename to src/ja/psync.conf.5
diff --git a/src/main.c b/src/main.c
index 45be5bf..76f4894 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* main.c - Last modified: 05-Jul-2021 (kobayasy)
+/* main.c - Last modified: 10-Jul-2021 (kobayasy)
  *
  * Copyright (c) 2018-2021 by Yuichi Kobayashi <kobayasy@kobayasy.com>
  *
@@ -24,7 +24,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #else  /* #ifdef HAVE_CONFIG_H */
 #define PACKAGE_STRING "pSync"
 #endif  /* #ifdef HAVE_CONFIG_H */