diff --git a/README.md b/README.md
index f267777be66fa08df53bd6651169602219ea3fa5..c3dc802215684fe87fae5447dca56ba78d7c1f8d 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,13 @@ The following options are recognized by the liuthesis document class
 - `exhibitpage` - Produce an exhibit page (spikblad) and no thesis. Use
 	      this option to produce an exhibit page only for Licentiate/PhD
 	      dissertations.
+
 - `printerfriendly` - ensure chapters begin on recto pages
+- `ccby` - Add a [CC-BY](https://creativecommons.org/licenses/by/4.0/)
+  Creative Commons Attribution license to your work (default is no CC license).
+- `ccbync` - Add a
+  [CC-BY NC](https://creativecommons.org/licenses/by-nc/4.0/) Creative
+  Commons Attribution NonCommercial license to your work.
 - `swedish` - use Swedish as the main language, English as the secondary language
 - `english` - use English as the main language
 
@@ -110,9 +116,9 @@ This package contains a style file for theses (`liuthesis.cls`) and a file
 \addbibresource{<my bibliography file>}
 ```
 
-and possibly other settings. In the directory `figures/`, you should place all
-graphics for your thesis. Logos are included for LiU, please add other logotypes
-as appropriate.
+Other settings are optional. In the directory `figures/`, you should place all
+graphics for your thesis. Logos are included for LiU, please add other
+logotypes or graphics as needed.
 
 In your thesis file, you need to specify where the bibliography should be
 typeset using the command `\printbibliography`.
@@ -201,6 +207,17 @@ with the `header2` package. Put this information in an Emacs init file:
 (add-hook 'latex-mode-hook   'auto-make-header)
 ```
 
+It is possible to use the demo files or compile your manuscript
+without the file headers though.
+
+## ISBN commands
+
+You will need to supply your thesis-specific sections of the ISBN
+numbers of your thesis through the commands `\isbnprint{XXXX}{XXX}{X}`
+and `\isbnpdf{XXXX}{XXX}{X}`. The ISBN number for your online version
+will also form the basis of the permanent URL, the Document Object Identifier (DOI) of
+your thesis. See the examples in the demos.
+
 ## Complete list of parameters
 
 This is a complete list of parameters that can be modified as part of the
@@ -246,7 +263,7 @@ initial value `\texttt{\textbackslash edition}`.
 \createvariable{supportedby}
 \createvariable{publicationyear}
 \createvariable{publicationmonth}
-\createvariable{isbn}
+
 \createvariable{supervisor}
 \createvariable{examiner}
 \createvariable{titleenglish}
diff --git a/demo/demo_exhibitpage_filfak.pdf b/demo/demo_exhibitpage_filfak.pdf
index fbdb5408349373169b39168d11a2e7c462a6b63e..f6cadb54faa89c351533cd7bdbc2d4084920311d 100644
Binary files a/demo/demo_exhibitpage_filfak.pdf and b/demo/demo_exhibitpage_filfak.pdf differ
diff --git a/demo/demo_exhibitpage_lith.pdf b/demo/demo_exhibitpage_lith.pdf
index 8517aa10dc13701a373bdfefce611b898eae04da..0c988e4dbf3b8be5d501cf8b5401086cb7544521 100644
Binary files a/demo/demo_exhibitpage_lith.pdf and b/demo/demo_exhibitpage_lith.pdf differ
diff --git a/demo/demo_exhibitpage_phd_filfak.pdf b/demo/demo_exhibitpage_phd_filfak.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..82e67d78b946a44fccd3cbdb0c8bb135c069b7af
Binary files /dev/null and b/demo/demo_exhibitpage_phd_filfak.pdf differ
diff --git a/demo/demo_filfak_lic.pdf b/demo/demo_filfak_lic.pdf
index 2c2f9f64915c6376b53601869296c8ef6b9dc45d..778196a54822a2f151e9d0629d8336d9ca23dbf6 100644
Binary files a/demo/demo_filfak_lic.pdf and b/demo/demo_filfak_lic.pdf differ
diff --git a/demo/demo_filfak_phd.pdf b/demo/demo_filfak_phd.pdf
index 2220157b241494d23e6d9dd27d708643c17af29b..84aea2aedf19f9495bf1becc83876dfb9ba3f705 100644
Binary files a/demo/demo_filfak_phd.pdf and b/demo/demo_filfak_phd.pdf differ
diff --git a/demo/demo_lith_lic.pdf b/demo/demo_lith_lic.pdf
index 452f5980606a5c0a25ef6805504d96fee5f827af..921296c63a5613a608b2348a0d7b91008e0d6238 100644
Binary files a/demo/demo_lith_lic.pdf and b/demo/demo_lith_lic.pdf differ
diff --git a/demo/demo_lith_phd.pdf b/demo/demo_lith_phd.pdf
index 30b91c5ff2a0aceb4a7a032b5d38d6904e12e096..177db2737e4da20db2af991df47717b7cba19ad4 100644
Binary files a/demo/demo_lith_phd.pdf and b/demo/demo_lith_phd.pdf differ
diff --git a/demo/demo_student_thesis.pdf b/demo/demo_student_thesis.pdf
index 0bdbbe174b32ae28f2234b9617a6bb5f044dff54..ea9603829a955f9e54ae6007827ec51acef694c3 100644
Binary files a/demo/demo_student_thesis.pdf and b/demo/demo_student_thesis.pdf differ
diff --git a/demo_exhibitpage_filfak.tex b/demo_exhibitpage_filfak.tex
index 1aedc35e067f07c7d9f2b78dd5213376e4f1bbb2..6c33d1714c5edb579a13624abf0ba3c30e81b6ef 100644
--- a/demo_exhibitpage_filfak.tex
+++ b/demo_exhibitpage_filfak.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Mon Apr 16 14:58:03 2018 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 206
+%% Last-Updated: Wed Jan 12 15:32:20 2022 (+0100)
+%%           By: Ola
+%%     Update #: 207
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -58,7 +58,8 @@
 \keywordsswedish{data, IT}
 \keywords{computers, IT}
 
-\isbn{123456}
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
 
 \publicationyear{2017}
 \currentyearthesisnumber{001}
diff --git a/demo_exhibitpage_lith.tex b/demo_exhibitpage_lith.tex
index 4c1605bc74df8c74c8fc18b972bda111da69265d..058239a3595e76492eac48e227c39e232cb40e82 100644
--- a/demo_exhibitpage_lith.tex
+++ b/demo_exhibitpage_lith.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Thu Apr 13 11:21:06 2017 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 190
+%% Last-Updated: Wed Jan 12 15:28:44 2022 (+0100)
+%%           By: Ola
+%%     Update #: 197
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -54,7 +54,8 @@
 
 \keywordsswedish{data, IT}
 \keywords{computers, IT}
-\isbn{123456}
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
 
 \publicationyear{2017}
 \currentyearthesisnumber{001}
@@ -70,9 +71,8 @@
 \opponentname{Donald Knuth}
 \opponentuniversity{Stanford University}
 \opponentcountry{USA}
-\division{Software and Systems}
+\division{Avdelningen Software and Systems}
 \supportedby{}
-\divanumber{989}
 
 \author{Författaren}
 
diff --git a/demo_exhibitpage_phd_filfak.tex b/demo_exhibitpage_phd_filfak.tex
new file mode 100644
index 0000000000000000000000000000000000000000..357570cbd281f2b45c2cdc54494979ae4fdb81cf
--- /dev/null
+++ b/demo_exhibitpage_phd_filfak.tex
@@ -0,0 +1,102 @@
+%%% demothesis.tex --- 
+%% 
+%% Filename: demothesis.tex
+%% Description: 
+%% Author: Ola Leifler
+%% Maintainer: 
+%% Created: Thu Oct 14 12:52:20 2010 (CEST)
+%% Version: $Id$
+%% Version: 
+%% Last-Updated: Tue Aug 31 10:04:46 2021 (+0200)
+%%           By: Ola
+%%     Update #: 218
+%% URL: 
+%% Keywords: 
+%% Compatibility: 
+%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% 
+%%% Commentary: 
+%% 
+%% 
+%% 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% 
+%%% Change log:
+%% 
+%% 
+%% RCS $Log$
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% 
+%%% Code:
+\documentclass[phd, english, filfak, exhibitpage]{liuthesis}
+%% Settings go in settings.tex
+\include{settings}
+
+\department{Institutionen för datavetenskap} 
+\departmentenglish{Department of Computer and Information Science}
+\departmentshort{IDA}
+\edition{1:1}
+
+ \supervisor{Tom Ziemke}
+ \titleenglish{Social Robots as Intentional Agents}
+ \subtitleenglish{...}
+ \titleswedish{...}
+ \subtitleswedish{...}
+\division{Division for Human-Centered Systems}
+\divisionshort{HCS}
+\thesisnumber{111111}
+
+
+% You will need to enable the use of subseries with the command
+% "\subseriestrue", disable by commenting out or use "\subseriesfalse"
+\publicationseries{Linköping Studies in Arts and Sciences}
+% \subseriestrue
+\subseries{Linköping Studies in}
+\subseriesnumber{14}
+\thesisnumber{811}
+
+\publicationyear{2021}
+\publicationmonth{September}
+\isbn{978-91-7929-008-5}
+\issn{0282-9800}
+\divanumber{456789}
+\author{Sam Thellman}
+
+%Spikblad
+
+\presentationroom{ACAS}
+\presentationbuilding{A}
+\presentationcampus{Valla}
+\presentationdate{29 oktober 2021}
+\presentationtime{09:00}
+
+
+\thesislanguage{English}
+\faculty{Arts and Sciences}
+
+\exhibittext{..}
+\exhibittextswedish{..}
+\opponenttitle{Prof.}
+\opponentname{Agnieszka Wykowska}
+\opponentuniversity{Instituto Italiano di Tecnologia}
+\opponentcountry{Italien}
+\supportedby{..}
+\supervisor{Tom Ziemke}
+\keywords{..}
+\keywordsswedish{..}
+
+
+\thesissubject{Kognitionsvetenskap}
+
+
+\begin{document}
+
+\end{document}
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%% demothesis.tex ends here
+
diff --git a/demo_filfak_lic.tex b/demo_filfak_lic.tex
index 2a651e908c463b0846293ffbdc7017e3e3710340..6efcf08e0d0ad816ea25b8580fa07d7b103d476c 100644
--- a/demo_filfak_lic.tex
+++ b/demo_filfak_lic.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Thu Apr 13 13:18:33 2017 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 176
+%% Last-Updated: Thu Jan 13 10:29:28 2022 (+0100)
+%%           By: Ola
+%%     Update #: 183
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -43,8 +43,10 @@
 \thesisnumber{111111}
 
 \publicationyear{2017}
-\isbn{123456}
-\divanumber{456789}
+
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
+
 \author{Författaren}
 
 \begin{document}
diff --git a/demo_filfak_phd.tex b/demo_filfak_phd.tex
index d0bded71a44a8113f05259cf3ff0fe4f8bceeed9..c99da7741906f0921456d9c3e71be5d06ae6ba06 100644
--- a/demo_filfak_phd.tex
+++ b/demo_filfak_phd.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Mon Apr 16 14:58:27 2018 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 192
+%% Last-Updated: Thu Jan 13 10:37:57 2022 (+0100)
+%%           By: Ola
+%%     Update #: 193
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -49,8 +49,8 @@
 \subseriesnumber{14}
 
 \publicationyear{2017}
-\isbn{123456}
-\divanumber{456789}
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
 
 \author{Författaren}
 
diff --git a/demo_lith_lic.tex b/demo_lith_lic.tex
index f0a2c6e0380182f65a54a91675229d669324faee..b2a9b0d509c338009fbb941ffdf8cfed091e8c69 100644
--- a/demo_lith_lic.tex
+++ b/demo_lith_lic.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Thu Jun 15 16:32:59 2017 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 182
+%% Last-Updated: Thu Jan 13 10:37:29 2022 (+0100)
+%%           By: Ola
+%%     Update #: 183
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -46,8 +46,8 @@
 % \dedication{I dedicate this thesis to ...}
 
 \publicationyear{2017}
-\isbn{123456}
-\divanumber{456789}
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
 \author{Författaren}
 
 \begin{document}
diff --git a/demo_lith_phd.tex b/demo_lith_phd.tex
index eadac0e4e73daab935216e67deee4e15db015a6d..77319419007d23670eac35afe97b67635c99afff 100644
--- a/demo_lith_phd.tex
+++ b/demo_lith_phd.tex
@@ -7,9 +7,9 @@
 %% Created: Thu Oct 14 12:52:20 2010 (CEST)
 %% Version: $Id$
 %% Version: 
-%% Last-Updated: Mon Aug 14 16:34:10 2017 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 178
+%% Last-Updated: Wed Jan 12 15:59:37 2022 (+0100)
+%%           By: Ola
+%%     Update #: 180
 %% URL: 
 %% Keywords: 
 %% Compatibility: 
@@ -45,7 +45,8 @@
 \thesisnumber{111111}
 
 \publicationyear{2017}
-\isbn{123456}
+\isbnprint{1234}{56}{7}
+\isbnpdf{2345}{67}{8}
 \divanumber{456789}
 \author{Författaren}
 
diff --git a/liuthesis.cls b/liuthesis.cls
index b64595b98f485249dc3ab278accb0a4f54eda1a6..9dcf8c040cb1df0c9ddf56a506914ce97d969ebe 100644
--- a/liuthesis.cls
+++ b/liuthesis.cls
@@ -6,9 +6,9 @@
 %% Maintainer:
 %% Created: Fri Mar 20 08:25:23 2009 (CET)
 %% Version:
-%% Last-Updated: Mon Apr 16 15:04:30 2018 (+0200)
-%%           By: Ola Leifler
-%%     Update #: 1560
+%% Last-Updated: Thu Jan 13 10:34:01 2022 (+0100)
+%%           By: Ola
+%%     Update #: 1618
 %% URL:
 %% Keywords:
 %% Compatibility:
@@ -104,7 +104,16 @@
 \createvariable{supportedby}
 \createvariable{publicationyear}
 \createvariable{publicationmonth}
-\createvariable{isbn}
+
+\newcommand{\isbnprint}[3]{
+  \gdef\@isbnprint{978--91--#1--#2--#3}
+}
+\newcommand{\isbnpdf}[3]{
+  \gdef\@isbnpdf{978--91--#1--#2--#3}
+  \gdef\@doi{\url{https://doi.org/10.3384/97891#1#2#3}}
+}
+
+\createvariable{license}
 \createvariable{supervisor}
 \createvariable{examiner}
 \createvariable{titleenglish}
@@ -163,6 +172,16 @@
 \newif\ifprinterfriendly
 \printerfriendlyfalse
 
+% Default CC license is no such license
+
+\gdef\@license{}
+\DeclareOption{ccby}{
+  \gdef\@license{CC BY}
+}
+
+\DeclareOption{ccbync}{
+  \gdef\@license{CC BY-NC}
+}
 
 \DeclareOption{hu}{%
   \hutrue
@@ -566,10 +585,7 @@
 
 \newcommand{\exhibitpagelith}{%
   \@calibri
-    \copypagestyle{exhibitpagestyle}{plain}
-    \makeevenfoot{exhibitpagestyle}{ISBN \@isbn}{}{ISSN \@issn}
-    \makeoddfoot{exhibitpagestyle}{ISBN \@isbn}{}{ISSN \@issn}
-    \thispagestyle{exhibitpagestyle}
+    \thispagestyle{empty}
   \begin{center}
     {\footnotesize \@publicationseries}\\
     {\footnotesize \ifphd Dissertations,\else Licentiate Thesis\fi {} No. \@thesisnumber}\\[15mm]
@@ -580,39 +596,32 @@
     {\small\textbf{Akademisk avhandling}\\
     som för framläggande av \@degreetype{} i \@thesissubject{}
     vid Linköpings universitet kommer att offentligt försvaras i sal
-    \@presentationroom, hus \@presentationbuilding, universitetsområde
+    \@presentationroom, hus \@presentationbuilding, campus
     \@presentationcampus, \@presentationdate{} kl. \@presentationtime}\\[2\baselineskip]
     \textbf{Fakultetsopponent}\\
     \@opponenttitle{} \@opponentname\\
     \@opponentuniversity\\
     \@opponentcountry
     \\[15mm]
+     \small \textbf{Abstract}\\
+    \@abstract
     \vfill
     \includegraphics[width=35mm]{liu_primary_black_en}
     \\[15mm]
-   Linköping University\\
-  \@departmentenglish\\
   \@division\\
-    SE--581 83 Linköping\\[5mm]
-    Linköping \@publicationyear\\
-    \vspace*{1mm}
+  \@departmentenglish\\
+  Linköpings universitet, SE--581 83 Linköping, Sweden\\
+  ISBN \@isbnprint{} (tryckt)\hspace{15mm} ISBN \@isbnpdf{} (PDF)\\
+  \@doi\\
+  ISSN \@issn
   \end{center}
   \clearpage{}
-  \@calibri
-    \small \textbf{Abstract}\\
-    \@abstract
-    \vfill
-    \footnotesize
-    \begin{flushleft}
-      Keywords: \@keywords\\[3mm]
-      \@supportedby\mbox{}\\[3mm]
-      URL:    \texttt{http://urn.kb.se/resolve?urn=urn:nbn:se:liu:diva-\@divanumber}\\[3mm]
-    \end{flushleft}
-
   }
 
 
-\newcommand{\exhibitpagefilfak}{%
+  \newcommand{\exhibitpagefilfak}{%
+    \thispagestyle{empty}
+    
   \begin{center}
     \@korolev
       \@publicationseries{} No. \@thesisnumber
@@ -627,19 +636,20 @@
     {\bfseries Akademisk avhandling}\\
     som för framläggande av \@degreetype{} i \@thesissubject{}
     vid Filosofiska fakulteten kommer att offentligt försvaras i sal
-    \@presentationroom, hus \@presentationbuilding, universitetsområde
+    \@presentationroom, hus \@presentationbuilding, campus
     \@presentationcampus, \@presentationdate{} kl. \@presentationtime\\[2\baselineskip]
     {\bfseries Sammanfattning}\\
     \@exhibittextswedish\\[6mm]
     \vfill
     \begin{flushleft}
       Nyckelord: \@keywordsswedish\\[3mm]
-      URL:    \texttt{http://urn.kb.se/resolve?urn=urn:nbn:se:liu:diva-\@divanumber}
     \end{flushleft}
     \includegraphics[width=35mm]{liu_primary_black_sv}\\
     \@department\\
     Linköpings universitet, 581 83 Linköping\\[5mm]
-    ISBN \@isbn{} ISSN \@issn
+  ISBN \@isbnprint{} (tryckt)\hspace{15mm} ISBN \@isbnpdf{} (PDF)\\
+  \@doi\\
+  ISSN \@issn
   \clearpage{}
   \normalsize
    {\@publicationseries{} No. \@thesisnumber
@@ -663,12 +673,13 @@
   \vfill
   \begin{flushleft}
     Keywords: \@keywords\\[3mm]
-    URL:    \texttt{http://urn.kb.se/resolve?urn=urn:nbn:se:liu:diva-\@divanumber}
   \end{flushleft}
   \includegraphics[width=35mm]{liu_primary_black_en} \\
     \@departmentenglish\\
-   Linköping University, SE--581 83 Linköping\\[5mm]
-    ISBN \@isbn{} ISSN \@issn
+   Linköping University, SE--581 83 Linköping, Sweden\\[5mm]
+  ISBN \@isbnprint{} (print)\hspace{15mm} ISBN \@isbnpdf{} (PDF)\\
+  \@doi\\
+  ISSN \@issn
   \end{center}
   \clearpage{}
 }
@@ -853,19 +864,20 @@
   \fi
   \vfill
   \begin{flushleft}
+    \@license\mbox{}\\[3cm]
+    Typeset using \ifxetex\XeTeX\else\LaTeX\fi\\[1cm]
+    Printed by LiU-Tryck, Linköping \@publicationyear\\[1cm]
     Edition \@edition\\[5mm]
     \copyright{} \@author, \@publicationyear\\
-    ISBN \@isbn\\
+    ISBN \@isbnprint{} \swedishenglish{(tryckt)}{(print)}\\
+    ISBN \@isbnpdf{} (PDF)\\
+    \@doi\\
     ISSN \@issn\\
-    {\footnotesize URL \texttt{http://urn.kb.se/resolve?urn=urn:nbn:se:liu:diva-\@divanumber}}\\[1cm]
     Published articles have been reprinted with permission from the
-    respective
-    copyright holder.\\
-%    Paper III \copyright{} XXX\\
-    Typeset using \ifxetex\XeTeX\else\LaTeX\fi\\[1cm]
-    Printed by LiU-Tryck, Linköping \@publicationyear
+    respective copyright holder.\\
   \end{flushleft}
-  \clearpage}
+  \clearpage
+}
 
 % Intro page for MSC theses
 \newcommand{\makeinsidepage}{