This presentation aims to describe an international project to edit the corpus of Old Norse-Icelandic skaldic poetry and to outline some issues related to electronic aspects of the project, both in its organisation and in its publication. Prof. Clunies Ross will outline the nature of the project and the place of the electronic edition. Tarrin Wills will present information relating to the electronic encoding of the corpus. This will include explanation and discussion of issues related to the collation of electronic facsimiles of the manuscripts and the encoding of skaldic verse, in particular, the encoding of the native poetic devices known as 'kenningar' and 'heiti'. Hosted by the Scholarly Text and Imaging Service (SETIS), the University of Sydney Library, and the Research Institute for Humanities and Social Sciences (RIHSS), the University of Sydney.