Hi, I agree with you. I tried to search the Internet and both noun phrases are common. But the second sentence can be rewritten as He's making an instructional dvd on massage.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.