So you do need to report both pieces. However, they key to making sure you aren't paying tax on this twice is to make sure that the basis taken against the proceeds on the 1099-B. It probably is already included, but you can check by taking a look at the gain on the stock sale - it should be very close to zero.
