See if this patch file works. It was generated against maint branch instead of master with this command:

git format-patch origin/maint

If it still does not work for you, use the attached the org.texi file instead. Just copy the entire Working With Source Code chapter. 

Best wishes,