diff --git a/doc/paper/taler.tex b/doc/paper/taler.tex
index 8b48ad82f..9cff69e93 100644
--- a/doc/paper/taler.tex
+++ b/doc/paper/taler.tex
@@ -20,25 +20,6 @@
 % CG adds:
 % We SHOULD do this for the FINAL paper, not for the anon submission.
 
-\documentclass{llncs}
-%\usepackage[margin=1in,a4paper]{geometry}
-\usepackage[T1]{fontenc}
-\usepackage{palatino}
-\usepackage{xspace}
-\usepackage{microtype}
-\usepackage{amsmath,amssymb,eurosym}
-\usepackage[dvipsnames]{xcolor}
-\usepackage{tikz}
-\usetikzlibrary{shapes,arrows}
-\usetikzlibrary{positioning}
-\usetikzlibrary{calc}
-% \usepackage{enumitem}
-\usepackage{caption}
-%\usepackage{subcaption}
-\usepackage{subfig}
-% \usepackage{sidecap}
-% \usepackage{wrapfig}
-
 % Relate to:
 % http://fc14.ifca.ai/papers/fc14_submission_124.pdf
 
@@ -63,23 +44,70 @@
 % - transaction = coin ownership transfer that should be taxed
 % - sharing = coin copying that should not be taxed
 
-
-\title{Refreshing Coins for Giving Change and Refunds \\ in Chaum-style Anonymous Payment Systems}
-
-\begin{document}
-\mainmatter
-
-%\author{Florian Dold \and Sree Harsha Totakura \and Benedikt M\"uller \and Jeff Burdges \and Christian Grothoff}
-%\institute{The GNUnet Project}
-
-
-\maketitle
-
 % FIXME: As a general comment, I think we're mixing the crypto stuff and the systems
 %        stuff too much.  It might be more appropriate to have to systems stuff in a separate
 %        section, and the "pure" crypto stuff for the crypto people?
 
 
+\documentclass[sigconf, authordraft]{acmart}
+
+\usepackage{booktabs} % For formal tables
+\usepackage{tikz}
+\usetikzlibrary{shapes,arrows}
+\usetikzlibrary{positioning}
+\usetikzlibrary{calc}
+\usepackage{eurosym}
+
+
+% Copyright
+%\setcopyright{none}
+%\setcopyright{acmcopyright}
+%\setcopyright{acmlicensed}
+\setcopyright{rightsretained}
+%\setcopyright{usgov}
+%\setcopyright{usgovmixed}
+%\setcopyright{cagov}
+%\setcopyright{cagovmixed}
+
+
+% DOI
+\acmDOI{10.475/123_4}
+
+% ISBN
+\acmISBN{123-4567-24-567/08/06}
+
+%Conference
+\acmConference[WOODSTOCK'97]{ACM Woodstock conference}{July 1997}{El
+  Paso, Texas USA} 
+\acmYear{1997}
+\copyrightyear{2016}
+
+\acmPrice{15.00}
+
+\acmSubmissionID{123-A12-B3}
+
+\begin{document}
+\title{Refreshing Coins for Giving Change and Refunds \\ in Chaum-style Anonymous Payment Systems}
+\subtitle{Authors' names blinded for review}
+
+
+%\author{Ben Trovato}
+%\authornote{Dr.~Trovato insisted his name be first.}
+%\orcid{1234-5678-9012}
+%\affiliation{%
+%  \institution{Institute for Clarity in Documentation}
+%  \streetaddress{P.O. Box 1212}
+%  \city{Dublin} 
+%  \state{Ohio} 
+%  \postcode{43017-6221}
+%}
+%\email{trovato@corporation.com}
+
+
+% The default list of authors is too long for headers}
+%\renewcommand{\shortauthors}{B. Trovato et al.}
+
+
 \begin{abstract}
 This paper introduces {\em Taler}, a Chaum-style digital payment system that
 enables anonymous payments while ensuring that entities that receive
@@ -106,6 +134,46 @@ and adequately balances the state's need for monetary control with the
 citizen's needs for private economic activity.
 \end{abstract}
 
+%
+% The code below should be generated by the tool at
+% http://dl.acm.org/ccs.cfm
+% Please copy and paste the code instead of the example below. 
+%
+\begin{CCSXML}
+<ccs2012>
+ <concept>
+  <concept_id>10010520.10010553.10010562</concept_id>
+  <concept_desc>Computer systems organization~Embedded systems</concept_desc>
+  <concept_significance>500</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10010520.10010575.10010755</concept_id>
+  <concept_desc>Computer systems organization~Redundancy</concept_desc>
+  <concept_significance>300</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10010520.10010553.10010554</concept_id>
+  <concept_desc>Computer systems organization~Robotics</concept_desc>
+  <concept_significance>100</concept_significance>
+ </concept>
+ <concept>
+  <concept_id>10003033.10003083.10003095</concept_id>
+  <concept_desc>Networks~Network reliability</concept_desc>
+  <concept_significance>100</concept_significance>
+ </concept>
+</ccs2012>  
+\end{CCSXML}
+
+\ccsdesc[500]{Computer systems organization~Embedded systems}
+\ccsdesc[300]{Computer systems organization~Redundancy}
+\ccsdesc{Computer systems organization~Robotics}
+\ccsdesc[100]{Networks~Network reliability}
+
+
+\keywords{ACM proceedings, \LaTeX, text tagging}
+
+\maketitle
+
 \section{Introduction}
 
 The design of payment systems shapes economies and societies.  Strong,
@@ -151,7 +219,7 @@ provides fair exchange and exculpability via cryptographic proofs.
 \begin{figure}[h]
 \centering
 \begin{tikzpicture}
- \tikzstyle{def} = [node distance= 1em and 11em, inner sep=1em, outer sep=.3em];
+ \tikzstyle{def} = [node distance= 2em and 6.5em, inner sep=1em, outer sep=.3em];
  \node (origin) at (0,0) {};
  \node (exchange) [def,above=of origin,draw]{Exchange};
  \node (customer) [def, draw, below left=of origin] {Customer};
@@ -193,6 +261,7 @@ which owned the original coin.
 
 
 %\vspace{-0.3cm}
+
 \section{Related Work}
 %\vspace{-0.3cm}
 
@@ -1284,8 +1353,10 @@ We thank people (anonymized).
 %Jacob Appelbaum for productive discussions and support.
 \newpage
 
-\bibliographystyle{alpha}
-\bibliography{taler,rfc}
+\bibliographystyle{ACM-Reference-Format}
+\bibliography{taler} 
+
+\end{document}
 
 %\vfill
 %\begin{center}
@@ -1875,3 +1946,4 @@ provides a payment system with the following key properties:
     The payment system handles both small and large payments in
     an efficient and reliable manner.
 \end{description}
+