diff --git a/base/proposal.cls b/base/proposal.cls
index b62863a..bb380a8 100644
--- a/base/proposal.cls
+++ b/base/proposal.cls
@@ -19,6 +19,7 @@
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
 \newif\if@numericcites\@numericcitesfalse
+\newif\if@longtasklabels\@longtasklabelsfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
@@ -32,6 +33,7 @@
 \DeclareOption{report}{\def\proposal@class{report}}
 \DeclareOption{keys}{\keystrue}
 \DeclareOption{deliverables}{\delivstrue}
+\DeclareOption{longtasklabels}{\@longtasklabelstrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions
 \LoadClass[a4paper,twoside]{\proposal@class}
diff --git a/base/proposal.dtx b/base/proposal.dtx
index 83d3654..c66af80 100644
--- a/base/proposal.dtx
+++ b/base/proposal.dtx
@@ -151,6 +151,9 @@
 % The \DescribeMacro{wpsubsection}|wpsubsection| option specifies that we want to see
 % subsections headings for the WPs (and WAs, if we have them).
 % 
+% The \DescribeMacro{longtasklabels}|longtasklabels| option specifies that we want to long
+% task labels (i.e. including the WP and possibly WA numbers)
+% 
 % The \DescribeMacro{report}|report| option specifies that we want to use the |report.cls|
 % class as a basis for |proposal| instead of the default |article.cls|.
 %
@@ -624,6 +627,7 @@
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
 \newif\if@numericcites\@numericcitesfalse
+\newif\if@longtasklabels\@longtasklabelsfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
@@ -637,6 +641,7 @@
 \DeclareOption{report}{\def\proposal@class{report}}
 \DeclareOption{keys}{\keystrue}
 \DeclareOption{deliverables}{\delivstrue}
+\DeclareOption{longtasklabels}{\@longtasklabelstrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions
 \LoadClass[a4paper,twoside]{\proposal@class}
@@ -1124,6 +1129,7 @@
 {\def\wp@wphases{0-0}% default values
 \def\wp@swsites{false}
 \setkeys{workpackage}{#1}\stepcounter{wp}\stepcounter{allwp}%
+\pdata@target{wp}{\wp@id}{}%
 \startend@wphases\wp@wphases%
 \pdata@def{wp}\wp@id{start}\wphase@start\pdata@def{wp}\wp@id{end}\wphase@end%
 \@ifundefined{wp@type}{}{\pdata@def{wp}\wp@id{type}\wp@type}%
@@ -1173,7 +1179,7 @@
 % \begin{macro}{\wptitle}
 %   \ednote{document above}
 %    \begin{macrocode}
-\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
+\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdataref{wp}\wp@id{title}}
 %    \end{macrocode}
 % \end{macro}
 %
@@ -1332,12 +1338,15 @@
 {\smallskip\begin{compactenum}}{\end{compactenum}\smallskip}
 %    \end{macrocode}
 % \end{environment}
-% The next step is to 
+%
+% The next step is to define task labels
+% 
 %    \begin{macrocode}
+\newcommand\task@@label[1]{\textbf{T#1}}
 \ifwork@areas
-\newcommand\task@label[3]{\textbf{T#1.#2.#3}}
+\newcommand\task@label[3]{\task@@label{#1.#2.#3}}
 \else
-\newcommand\task@label[2]{\textbf{T#1.#2}}
+\newcommand\task@label[2]{\task@@label{T#1.#2}}
 \fi
 %    \end{macrocode}
 % We define the keys for the task macro
@@ -1381,7 +1390,9 @@
 \@task{#1}%
 \ifx\task@status\@@status@canceled\color{lightgray}\fi
 \item[\pdata@target{task}{\taskin\task@id\wp@id}%
-{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]%
+{\if@longtasklabels%
+\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi%
+\else\task@@label\thetask@wp\fi}]%
 \textbf\task@title\task@post@title@space%
 %    \end{macrocode}
 % now we decode and show the work phases on the task, if they have been specified.
diff --git a/base/proposal.pdf b/base/proposal.pdf
index 72ccd1c..a0b2369 100644
Binary files a/base/proposal.pdf and b/base/proposal.pdf differ
diff --git a/base/proposal.sty b/base/proposal.sty
index 1a03559..f08b672 100644
--- a/base/proposal.sty
+++ b/base/proposal.sty
@@ -175,6 +175,7 @@
 {\def\wp@wphases{0-0}% default values
 \def\wp@swsites{false}
 \setkeys{workpackage}{#1}\stepcounter{wp}\stepcounter{allwp}%
+\pdata@target{wp}{\wp@id}{}%
 \startend@wphases\wp@wphases%
 \pdata@def{wp}\wp@id{start}\wphase@start\pdata@def{wp}\wp@id{end}\wphase@end%
 \@ifundefined{wp@type}{}{\pdata@def{wp}\wp@id{type}\wp@type}%
@@ -206,7 +207,7 @@
 \fi
 \ifx\wp@status\@@status@canceled\color{lightgray}\fi}
 {\end{work@package}}
-\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdata@target{wp}{\wp@id}{\pdataref{wp}\wp@id{title}}}
+\newcommand\wptitle{\wp@mk@title{\wp@num}: \pdataref{wp}\wp@id{title}}
 \newcommand\wprm{\pdataref@safe{wp}\wp@id{RM}\if@RAM\ RM+\pdataref{wp}\wp@id{RAM} RAM\fi}
 \newcount\site@contribution%
 \newcommand\if@site@contributes[2]{%
@@ -306,10 +307,11 @@
 \ifdelivs\closeout\wpg@delivs\fi}
 \newenvironment{tasklist}
 {\smallskip\begin{compactenum}}{\end{compactenum}\smallskip}
+\newcommand\task@@label[1]{\textbf{T#1}}
 \ifwork@areas
-\newcommand\task@label[3]{\textbf{T#1.#2.#3}}
+\newcommand\task@label[3]{\task@@label{#1.#2.#3}}
 \else
-\newcommand\task@label[2]{\textbf{T#1.#2}}
+\newcommand\task@label[2]{\task@@label{T#1.#2}}
 \fi
 \define@key{task}{id}{\def\task@id{#1}\@dmp{id=#1}}
 \define@key{task}{wphases}{\def\task@wphases{#1}\@dmp{wphases=#1}}
@@ -334,7 +336,9 @@
 \@task{#1}%
 \ifx\task@status\@@status@canceled\color{lightgray}\fi
 \item[\pdata@target{task}{\taskin\task@id\wp@id}%
-{\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi}]%
+{\if@longtasklabels%
+\ifwork@areas\task@label\thewa\thewp\thetask@wp\else\task@label\thewp\thetask@wp\fi%
+\else\task@@label\thetask@wp\fi}]%
 \textbf\task@title\task@post@title@space%
 \def\@initial{0-0}%
 \ifx\task@wphases\@initial\else%
diff --git a/base/reporting.cls b/base/reporting.cls
index 4fe45ba..946662b 100644
--- a/base/reporting.cls
+++ b/base/reporting.cls
@@ -19,6 +19,7 @@
 \newif\if@svninfo\@svninfofalse
 \newif\if@gitinfo\@gitinfofalse
 \newif\if@numericcites\@numericcitesfalse
+\newif\if@longtasklabels\@longtasklabelsfalse
 \def\proposal@class{article}
 \DeclareOption{wpsubsection}{\@wpsubsectiontrue}
 \DeclareOption{submit}{\submittrue}
@@ -32,6 +33,7 @@
 \DeclareOption{report}{\def\proposal@class{report}}
 \DeclareOption{keys}{\keystrue}
 \DeclareOption{deliverables}{\delivstrue}
+\DeclareOption{longtasklabels}{\@longtasklabelstrue}
 \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
 \ProcessOptions
 \LoadClass[a4paper,twoside]{\proposal@class}