diff --git a/CHANGELOG b/CHANGELOG
index b6b7975..e89d045 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,8 @@ version 1.3.0 (xx xxx 201x)
  fullscreen mode).
  - added a 3rd, fully optional (can be omitted or left blank) argument to
  \address to specify a country, as requested on launchpad (launchpad bug
- #1063995).
+ #1063995).
+ - replaced the usage of the xargs package by the xparse one.
 
 version 1.2.1 (04 Dec 2012)
  - fixed a regression bug introduced in version 1.2.0 in the header of the
diff --git a/examples/template-es.pdf b/examples/template-es.pdf
index 7cb9c8a..7381bf7 100644
Binary files a/examples/template-es.pdf and b/examples/template-es.pdf differ
diff --git a/examples/template-zh.pdf b/examples/template-zh.pdf
index 7b37d92..2196575 100644
Binary files a/examples/template-zh.pdf and b/examples/template-zh.pdf differ
diff --git a/examples/template.pdf b/examples/template.pdf
index 0af0ce9..d0dda20 100644
Binary files a/examples/template.pdf and b/examples/template.pdf differ
diff --git a/examples/template_banking_red.pdf b/examples/template_banking_red.pdf
index 3a36321..b4e9075 100644
Binary files a/examples/template_banking_red.pdf and b/examples/template_banking_red.pdf differ
diff --git a/examples/template_casual_orange.pdf b/examples/template_casual_orange.pdf
index 4fe00a8..ac69e87 100644
Binary files a/examples/template_casual_orange.pdf and b/examples/template_casual_orange.pdf differ
diff --git a/examples/template_classic_green.pdf b/examples/template_classic_green.pdf
index 8ed4af3..f4c3c79 100644
Binary files a/examples/template_classic_green.pdf and b/examples/template_classic_green.pdf differ
diff --git a/examples/template_multibib.pdf b/examples/template_multibib.pdf
index ae52d9b..05928e1 100644
Binary files a/examples/template_multibib.pdf and b/examples/template_multibib.pdf differ
diff --git a/examples/template_oldstyle_grey.pdf b/examples/template_oldstyle_grey.pdf
index a341efe..6198f4a 100644
Binary files a/examples/template_oldstyle_grey.pdf and b/examples/template_oldstyle_grey.pdf differ
diff --git a/moderncv.cls b/moderncv.cls
index 10e1982..ae9c93e 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -170,7 +170,7 @@
 \RequirePackage{calc}
 
 % advanced command arguments (LaTeX 3)
-\RequirePackage{xargs,xparse}
+\RequirePackage{xparse}
 % TODO (?): replace all \newcommand by \NewDocumentCommand
 
 % micro-typography (e.g., character protrusion, font expansion, hyphenatable letterspacing)
@@ -299,7 +299,9 @@
 %                resume design commands definitions
 %-------------------------------------------------------------------------------
 % elements
-\newcommandx*{\photo}[3][1=64pt,2=0.4pt,usedefault]{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}% the 1st (optional) argument is the width of the photo, the 2nd (optional) argument is the thickness of the frame around it.
+% defines one's picture (optional)
+% usage: photo[<picture width>][<picture frame thickness>]{<picture filename>}
+\NewDocumentCommand{\photo}{O{64pt}O{0.4pt}m}{\def\@photowidth{#1}\def\@photoframewidth{#2}\def\@photo{#3}}
 \newcommand*{\quote}[1]{\def\@quote{#1}}
 
 % fonts