Japan is to release a Chinese fishing boat captain whose arrest two weeks ago led to the worst row with Beijing in years, Japanese media report.
The Japanese authorities had accused Zhan Qixiong of deliberately ramming two patrol vessels near disputed islands in the East China Sea.
China had been demanding his immediate and unconditional release.
The move came after four Japanese men were detained in China on suspicion of illegally filming in a military area.
A Japanese foreign ministry spokesman said its embassy in Beijing had received confirmation that the four were being held, but he said he did not want to speculate whether it was linked to Japan's detention of a Chinese fishing boat captain.
Officials said the four men were employees of a Japanese construction company who were in China to bid for a project to dispose of chemical weapons from World War II.