Disis build fixes

Albert Gräfrequested to merge
(removed):disis-build-fixes into master

Fixes issue #138 (closed). Tested on Arch, Ubuntu 14.04 and 16.04, works fine for me.

Merge request reports