Upgrade 2.0.6 -> 2.0.17 fails before it's started

Hi!

I'm trying to perform an upgrade from 2.0.6 to 2.0.17 but run into problems way before reaching the login (or let alone update database) stage:

Unknown column 'c.PermissionCategoryID' in 'on clause'
select distinct c.CategoryID as `CategoryID` from GDN_Category c inner join
GDN_Permission _p on _p.JunctionID = c.PermissionCategoryID

There does not seem to be a PermissionCategoryID in the GDN_Category table of my vanilla2 database, and this is obviously why it fails.

I'm aslo unable to reach any of the following pages, altough I'm not 100% this is related:

http://gyver.cs.umu.se/~danielh/vanilla2/entry
http://gyver.cs.umu.se/~danielh/vanilla2/utility/structure
http://gyver.cs.umu.se/~danielh/vanilla2/utility/update
http://gyver.cs.umu.se/~danielh/vanilla2/?p=/utility/structure

I had the 2.0.6 version working ok, so there should not be any problems in finding the file it is complaining about (/Users/danielh/public_html/vanilla2/index.php, and it does exist).

(You can see the full stack trace at:http://gyver.cs.umu.se/~danielh/vanilla2/error.html)

Grateful for any help!