diff --git a/license.txt b/license.txt
index b63be50681a2c8e6b63db196e4321bdae820dab3..e668a420e31befbbd3654a7ab1afe9c77ae05117 100644
--- a/license.txt
+++ b/license.txt
@@ -1,4 +1,4 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=markup&pathrev=174
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: Dynare
 Upstream-Contact: Dynare Team, whose members in 2011 are:
  Stéphane Adjemian <stephane.adjemian@ens.fr>
@@ -11,7 +11,7 @@ Upstream-Contact: Dynare Team, whose members in 2011 are:
 Source: http://www.dynare.org
 
 Files: *
-Copyright: 1996-2011, Dynare Team
+Copyright: 1996-2011 Dynare Team
 License: GPL-3+
  Dynare is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -29,9 +29,27 @@ License: GPL-3+
 Files: matlab/AIM/SP*
 Copyright: public-domain
 License: public-domain
+ This code is in the public domain and may be used freely.
+ However the authors would appreciate acknowledgement of the source by
+ citation of any of the following papers:
+ .
+ Anderson, G. and Moore, G.
+ "A Linear Algebraic Procedure for Solving Linear Perfect Foresight
+ Models."
+ Economics Letters, 17, 1985.
+ .
+ Anderson, G.
+ "Solving Linear Rational Expectations Models: A Horse Race"
+ Computational Economics, 2008, vol. 31, issue 2, pages 95-113
+ .
+ Anderson, G.
+ "A Reliable and Computationally Efficient Algorithm for Imposing the
+ Saddle Point Property in Dynamic Models"
+ Journal of Economic Dynamics and Control, 2010, vol. 34, issue 3,
+ pages 472-489
 
 Files: matlab/bfgsi.m
-Copyright: 1993-2009, Christopher Sims
+Copyright: 1993-2009 Christopher Sims
 License: GPL-3+
  Dynare is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -46,12 +64,12 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: matlab/csolve.m, matlab/csminit.m, matlab/numgrad.m, matlab/numgrad3.m,
- matlab/numgrad5.m, matlab/csminwel.m, matlab/bvar_density.m,
- matlab/bvar_toolbox.m, matlab/partial_information/PI_gensys.m,
- matlab/qzswitch.m, matlab/qzdiv.m
-Copyright: 1993-2009, Christopher Sims
-           2006-2011, Dynare Team
+Files: matlab/csolve.m matlab/csminit.m matlab/numgrad.m matlab/numgrad3.m
+ matlab/numgrad5.m matlab/csminwel.m matlab/bvar_density.m
+ matlab/bvar_toolbox.m matlab/partial_information/PI_gensys.m
+ matlab/qzswitch.m matlab/qzdiv.m
+Copyright: 1993-2009 Christopher Sims
+           2006-2011 Dynare Team
 License: GPL-3+
  Dynare is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -66,15 +84,15 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: matlab/missing/stats/normpdf.m, matlab/missing/stats/gamcdf.m,
- matlab/missing/stats/common_size.m, matlab/missing/stats/chi2inv.m,
- matlab/missing/stats/gaminv.m, matlab/missing/stats/gampdf.m,
- matlab/missing/stats/stdnormal_inv.m, matlab/missing/stats/betacdf.m,
- matlab/missing/stats/betapdf.m, matlab/missing/stats/normcdf.m,
- matlab/missing/stats/stdnormal_cdf.m, matlab/missing/stats/norminv.m,
- matlab/missing/stats/stdnormal_pdf.m, matlab/missing/stats/betainv.m
-Copyright: 1995-2007, Kurt Hornik
-           2008-2009, Dynare Team
+Files: matlab/missing/stats/normpdf.m matlab/missing/stats/gamcdf.m
+ matlab/missing/stats/common_size.m matlab/missing/stats/chi2inv.m
+ matlab/missing/stats/gaminv.m matlab/missing/stats/gampdf.m
+ matlab/missing/stats/stdnormal_inv.m matlab/missing/stats/betacdf.m
+ matlab/missing/stats/betapdf.m matlab/missing/stats/normcdf.m
+ matlab/missing/stats/stdnormal_cdf.m matlab/missing/stats/norminv.m
+ matlab/missing/stats/stdnormal_pdf.m matlab/missing/stats/betainv.m
+Copyright: 1995-2007 Kurt Hornik
+           2008-2009 Dynare Team
 License: GPL-3+
  Dynare is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -90,7 +108,7 @@ License: GPL-3+
  along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
 Files: matlab/missing/bicgstab/bicgstab.m
-Copyright: 2008, Radek Salac
+Copyright: 2008 Radek Salac
 License: GPL-3+
  This file is part of Octave.
  .
@@ -108,8 +126,8 @@ License: GPL-3+
  along with Octave; see the file COPYING.  If not, see
  <http://www.gnu.org/licenses/>.
 
-Files: doc/dynare.texi, doc/*.tex, doc/*.svg, doc/*.dia, doc/*.pdf, doc/*.bib
-Copyright: 1996-2011, Dynare Team
+Files: doc/dynare.texi doc/*.tex doc/*.svg doc/*.dia doc/*.pdf doc/*.bib
+Copyright: 1996-2011 Dynare Team
 License: GFDL-1.3+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -118,8 +136,8 @@ License: GFDL-1.3+
  .
  A copy of the license can be found at <http://www.gnu.org/licenses/fdl.txt>
 
-Files: doc/userguide/*.tex, doc/userguide/*.bib, doc/userguide/*.pdf
-Copyright: 2007-2011, Tommaso Mancini Griffoli
+Files: doc/userguide/*.tex doc/userguide/*.bib doc/userguide/*.pdf
+Copyright: 2007-2011 Tommaso Mancini Griffoli
 License: GFDL-1.3+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -129,7 +147,7 @@ License: GFDL-1.3+
  A copy of the license can be found at <http://www.gnu.org/licenses/fdl.txt>
 
 Files: doc/dr.tex
-Copyright: 2009, 2011, Sébastien Villemot
+Copyright: 2009,2011 Sébastien Villemot
 License: GFDL-1.3+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -139,7 +157,7 @@ License: GFDL-1.3+
  A copy of the license can be found at <http://www.gnu.org/licenses/fdl.txt>
 
 Files: doc/bvar_a_la_sims.tex
-Copyright: 2007-2011, Sébastien Villemot
+Copyright: 2007-2011 Sébastien Villemot
 License: GFDL-1.3+
  Permission is granted to copy, distribute and/or modify this document
  under the terms of the GNU Free Documentation License, Version 1.3 or
@@ -148,10 +166,10 @@ License: GFDL-1.3+
  .
  A copy of the license can be found at <http://www.gnu.org/licenses/fdl.txt>
 
-Files: dynare++/*.cweb, dynare++/*.hweb, dynare++/*.cpp, dynare++/*.h,
- dynare++/*.tex, dynare++/*.mod, dynare++/*.m, dynare++/*.web, dynare++/*.lex,
+Files: dynare++/*.cweb dynare++/*.hweb dynare++/*.cpp dynare++/*.h
+ dynare++/*.tex dynare++/*.mod dynare++/*.m dynare++/*.web dynare++/*.lex
  dynare++/*.y
-Copyright: 2004-2011, Ondra Kamenik
+Copyright: 2004-2011 Ondra Kamenik
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -166,9 +184,9 @@ License: GPL-3+
  You should have received a copy of the GNU General Public License
  along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: dynare++/utils/*.cpp, dynare++/utils/*.h, dynare++/parser/*.cpp,
- dynare++/parser/*.h, dynare++/parser/*.lex, dynare++/parser/*.y
-Copyright: 2004-2011, Ondra Kamenik
+Files: dynare++/utils/*.cpp dynare++/utils/*.h dynare++/parser/*.cpp
+ dynare++/parser/*.h dynare++/parser/*.lex dynare++/parser/*.y
+Copyright: 2004-2011 Ondra Kamenik
 License: LGPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Lesser General Public License as published by
@@ -183,9 +201,9 @@ License: LGPL-3+
  You should have received a copy of the GNU Lesser General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: m4/ax_blas.m4, m4/ax_lapack.m4
-Copyright: 2008, Steven G. Johnson <stevenj@alum.mit.edu>
-License: GPL-3+ with special Autoconf exception
+Files: m4/ax_blas.m4 m4/ax_lapack.m4
+Copyright: 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+License: GPL-3+ with Autoconf exception
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
  Free Software Foundation, either version 3 of the License, or (at your
@@ -213,9 +231,9 @@ License: GPL-3+ with special Autoconf exception
  exception to the GPL to apply to your modified version as well.
 
 Files: m4/ax_pthread.m4
-Copyright: 2008, Steven G. Johnson <stevenj@alum.mit.edu>
-           2010, Dynare Team
-License: GPL-3+ with special Autoconf exception
+Copyright: 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+           2010 Dynare Team
+License: GPL-3+ with Autoconf exception
  This program is free software: you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the
  Free Software Foundation, either version 3 of the License, or (at your
@@ -243,23 +261,23 @@ License: GPL-3+ with special Autoconf exception
  exception to the GPL to apply to your modified version as well.
 
 Files: m4/ax_boost_base.m4
-Copyright: 2008, Thomas Porschberg <thomas@randspringer.de>
-           2009, Dynare Team
+Copyright: 2008 Thomas Porschberg <thomas@randspringer.de>
+           2009 Dynare Team
 License:
  Copying and distribution of this file, with or without modification, are
  permitted in any medium without royalty provided the copyright notice
  and this notice are preserved.
 
 Files: m4/ax_compare_version.m4
-Copyright: 2008, Tim Toolan <toolan@ele.uri.edu>
+Copyright: 2008 Tim Toolan <toolan@ele.uri.edu>
 License:
  Copying and distribution of this file, with or without modification, are
  permitted in any medium without royalty provided the copyright notice
  and this notice are preserved.
 
-Files: m4/ax_latex_bibtex_test.m4, m4/ax_latex_class.m4, m4/ax_tex_test.m4
-Copyright: 2008, Boretti Mathieu <boretti@eig.unige.ch>
-           2009, Dynare Team
+Files: m4/ax_latex_bibtex_test.m4 m4/ax_latex_class.m4 m4/ax_tex_test.m4
+Copyright: 2008 Boretti Mathieu <boretti@eig.unige.ch>
+           2009 Dynare Team
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published by
@@ -274,10 +292,10 @@ License: LGPL-2.1+
  You should have received a copy of the GNU Lesser General Public License
  along with this library. If not, see <http://www.gnu.org/licenses/>.
 
-Files: m4/ax_matlab_arch.m4, m4/ax_matlab.m4, m4/ax_mexext.m4
-Copyright: 2002-2003, Ralph Schleicher
-           2009, Dynare Team
-License: GPL-2+ with special Autoconf exception
+Files: m4/ax_matlab_arch.m4 m4/ax_matlab.m4 m4/ax_mexext.m4
+Copyright: 2002-2003 Ralph Schleicher
+           2009 Dynare Team
+License: GPL-2+ with Autoconf exception
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2,
@@ -298,7 +316,7 @@ License: GPL-2+ with special Autoconf exception
  of that program.
 
 Files: dynare.el
-Copyright: 2010, Yannick Kalantzis
+Copyright: 2010 Yannick Kalantzis
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by