Import Debian support + bugfix