diff --git a/changelog.in b/changelog.in
index a354900ead..0afb0ed41e 100755
--- a/changelog.in
+++ b/changelog.in
@@ -239,6 +239,7 @@ Thanks: Mattias Grönkvist
 Distinct propagation (as used by distinct, channel, and circuit) would
 sometimes read from uninitialized memory.
 
+[ENTRY]
 Module: flatzinc
 What:   bug
 Rank:   minor
diff --git a/doxygen/doxygen.conf.in b/doxygen/doxygen.conf.in
index ab3a34bbc0..5fd31d7b0d 100755
--- a/doxygen/doxygen.conf.in
+++ b/doxygen/doxygen.conf.in
@@ -657,8 +657,10 @@ HTML_FOOTER            = @top_srcdir@/misc/doxygen/footer.html
 # will generate a default style sheet. Note that doxygen will try to copy
 # the style sheet file to the HTML output directory, so don't put your own
 # stylesheet in the HTML output directory as well, or it will be erased!
+# Note: this is now superseded by HTML_EXTRA_STYLESHEET, an extra
+# stylesheeet applied on top of the standard doxygen stylesheet.
 
-HTML_STYLESHEET        = @top_srcdir@/misc/doxygen/stylesheet.css
+HTML_EXTRA_STYLESHEET  = @top_srcdir@/misc/doxygen/stylesheet.css
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
 # files or namespaces will be aligned in HTML using tables. If set to
diff --git a/gecode/int.hh b/gecode/int.hh
index c330de0c59..4f2aa551da 100755
--- a/gecode/int.hh
+++ b/gecode/int.hh
@@ -873,14 +873,14 @@ namespace Gecode {
      * \brief Implication for reification
      *
      * For a constraint \f$c\f$ and a Boolean control variable \f$b\f$
-     * defines that \f$b=1\Leftarrow c\f$ is propagated.
+     * defines that \f$b=1\Rightarrow c\f$ is propagated.
      */
     RM_IMP,
     /**
      * \brief Inverse implication for reification
      *
      * For a constraint \f$c\f$ and a Boolean control variable \f$b\f$
-     * defines that \f$b=1\Rightarrow c\f$ is propagated.
+     * defines that \f$c\Rightarrow b=1\f$ is propagated.
      */
     RM_PMI
   };
diff --git a/gecode/int/ldsb.hh b/gecode/int/ldsb.hh
index a6c6cee674..bdeae6b50a 100644
--- a/gecode/int/ldsb.hh
+++ b/gecode/int/ldsb.hh
@@ -186,9 +186,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     Support::BitSetOffset<Space> indices;
   public:
     /// Constructor for creation
-    VariableSymmetryImp<View>(Space& home, int* vs, unsigned int n);
+    VariableSymmetryImp(Space& home, int* vs, unsigned int n);
     /// Copy constructor
-    VariableSymmetryImp<View>(Space& home, const VariableSymmetryImp<View>& other);
+    VariableSymmetryImp(Space& home, const VariableSymmetryImp<View>& other);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update
@@ -206,9 +206,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     /// Symmetric values
     Support::BitSetOffset<Space> values;
     /// Constructor for creation
-    ValueSymmetryImp<View>(Space& home, int* vs, unsigned int n);
+    ValueSymmetryImp(Space& home, int* vs, unsigned int n);
     /// Copy constructor
-    ValueSymmetryImp<View>(Space& home, const ValueSymmetryImp<View>& other);
+    ValueSymmetryImp(Space& home, const ValueSymmetryImp<View>& other);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update
@@ -248,9 +248,9 @@ namespace Gecode { namespace Int { namespace LDSB {
     int getVal(unsigned int sequence, unsigned int position) const;
   public:
     /// Constructor for creation
-    VariableSequenceSymmetryImp<View>(Space& home, int *_indices, unsigned int n, unsigned int seqsize);
+    VariableSequenceSymmetryImp(Space& home, int *_indices, unsigned int n, unsigned int seqsize);
     /// Copy constructor
-    VariableSequenceSymmetryImp<View>(Space& home, const VariableSequenceSymmetryImp<View>& s);
+    VariableSequenceSymmetryImp(Space& home, const VariableSequenceSymmetryImp<View>& s);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Search left-branch update
@@ -279,12 +279,12 @@ namespace Gecode { namespace Int { namespace LDSB {
     /// position.  (Both are zero-based.)
     int getVal(unsigned int sequence, unsigned int position) const;
   private:
-    ValueSequenceSymmetryImp<View>(const ValueSequenceSymmetryImp<View>&);
+    ValueSequenceSymmetryImp(const ValueSequenceSymmetryImp<View>&);
   public:
     /// Constructor for creation
-    ValueSequenceSymmetryImp<View>(Space& home, int* _values, unsigned int n, unsigned int seqsize);
+    ValueSequenceSymmetryImp(Space& home, int* _values, unsigned int n, unsigned int seqsize);
     /// Copy constructor
-    ValueSequenceSymmetryImp<View>(Space& home, const ValueSequenceSymmetryImp<View>& vss);
+    ValueSequenceSymmetryImp(Space& home, const ValueSequenceSymmetryImp<View>& vss);
     /// Disposal
     virtual size_t dispose(Space& home);
     /// Left-branch update
diff --git a/images/gecode-logo.svg b/images/gecode-logo.svg
new file mode 100755
index 0000000000..456d41200e
--- /dev/null
+++ b/images/gecode-logo.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="261.33334"
+   height="170.66667"
+   viewBox="0 0 261.33334 170.66667"
+   sodipodi:docname="gecode-logo.eps"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs6" /><sodipodi:namedview
+     id="namedview4"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0" /><g
+     id="g8"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,170.66667)"><g
+       id="g10"
+       transform="scale(0.1)"><path
+         d="M 0.867188,1040.34 V 240.32 c 0,-35.84 29.160112,-65 65.003912,-65 H 408.66 c -110.875,29.707 -193.199,51.778 -193.199,51.778 -71.895,19.277 -114.719,93.437 -95.453,165.336 0,0 142.426,531.515 191.027,712.906 H 65.8711 c -35.8438,0 -65.003912,-29.16 -65.003912,-65"
+         style="fill:#ed1c24;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path12" /><path
+         d="m 474.289,1193.01 c -34.613,9.28 -70.324,-11.34 -79.601,-45.96 L 187.625,374.305 c -4.473,-16.66 -2.129,-34.141 6.602,-49.258 8.711,-15.098 22.695,-25.879 39.359,-30.332 0,0 368.75,-98.809 596.793,-159.922 L 410.848,377.02 c -64.45,37.226 -86.621,119.941 -49.41,184.414 l 330.906,573.156 c -123.196,33.01 -218.055,58.42 -218.055,58.42"
+         style="fill:#f68712;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path14" /><path
+         d="m 861.551,1249.41 c -16.844,-4.51 -30.875,-15.22 -39.492,-30.16 l -400,-692.816 c -17.907,-31.036 -7.243,-70.856 23.789,-88.789 L 1138.66,37.625 c 13.87,-8.0078 29.46,-10.1172 44.08,-7.4414 L 668.055,544.891 c -25.407,25.429 -39.41,59.316 -39.41,95.464 0,36.133 14.003,70.04 39.421,95.45 0,0 242.957,242.968 410.434,410.425 l -167.652,96.81 c -14.942,8.62 -32.45,10.89 -49.297,6.37"
+         style="fill:#176fc1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path16" /><path
+         d="m 1375.17,1251.98 c -25.35,25.34 -66.58,25.34 -91.93,0 L 717.57,686.313 c -12.211,-12.196 -18.929,-28.528 -18.929,-45.969 0,-17.426 6.718,-33.754 18.929,-45.961 L 1283.25,28.6797 c 25.34,-25.33204 66.57,-25.33204 91.92,0 l 565.68,565.7033 c 12.21,12.187 18.93,28.515 18.93,45.953 0,17.441 -6.72,33.769 -18.93,45.965 l -565.68,565.679"
+         style="fill:#217444;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path18" /><path
+         d="m 1587.19,351.766 c -47,-15.996 -136,-38.008 -225,-38.008 -123.01,0 -212.01,31.008 -274.01,90 -61,59.004 -94.996,147.012 -94.996,246.008 1,224.004 163.996,352.004 384.996,352.004 87,0 154.01,-17 187,-32 l -32,-123.004 c -36.99,17.004 -81.99,29 -155.99,29 -127.01,0 -224.01,-72 -224.01,-217.996 0,-140.008 88.01,-221.004 213.01,-221.004 34,0 61.99,4.004 74,9.004 v 141.992 h -104 v 119.004 h 251 v -355"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path20" /></g></g></svg>
diff --git a/misc/doxygen/header.html b/misc/doxygen/header.html
index bc56a88ad1..dfc4fb2167 100644
--- a/misc/doxygen/header.html
+++ b/misc/doxygen/header.html
@@ -1,7 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=utf-8">
 <title>$title</title>
-<link href="$relpath$stylesheet.css" rel="stylesheet" type="text/css">
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="stylesheet.css" rel="stylesheet" type="text/css">
 <!--[if IE]><style type="text/css">
   @media screen {
     html, body {
@@ -22,7 +23,7 @@
 <body>
 
 <div id="logo">
-<img src='$relpath$gecode-logo-100.png' alt="Gecode logo" /></div>
+<img src='gecode-logo-100.png' alt="Gecode logo" /></div>
 
 <div id="navigation">
   <div id="navigation2">
diff --git a/misc/doxygen/stylesheet.css b/misc/doxygen/stylesheet.css
index 64dcd835a9..4ff983b5e4 100644
--- a/misc/doxygen/stylesheet.css
+++ b/misc/doxygen/stylesheet.css
@@ -6,13 +6,6 @@ margin:0;
 padding:0;
 }
 
-#content {
-position:absolute; top:30px; left:60px;
-width:60%;
-padding:0 0 50px 0;
-color:#000000;
-}
-
 #contentfront {
 position:absolute; top:250px; left:60px;
 width:50%;
diff --git a/misc/genrc.perl b/misc/genrc.perl
index 06fcb0118b..def2ba1736 100755
--- a/misc/genrc.perl
+++ b/misc/genrc.perl
@@ -172,7 +172,7 @@
     close SRCFILE;
     $description = "Gecode example: $example";
   } else {
-    die "Illegal file";
+    die "Illegal file $file";
   }
 }
 
diff --git a/tools/flatzinc/mzn-gecode.bat.in b/tools/flatzinc/mzn-gecode.bat.in
index c7032775eb..657782cd7d 100755
--- a/tools/flatzinc/mzn-gecode.bat.in
+++ b/tools/flatzinc/mzn-gecode.bat.in
@@ -34,4 +34,4 @@ rem
 
 setlocal
 set FLATZINC_CMD=fzn-gecode
-minizinc -I "%GECODEDIR%\mznlib" %*
+minizinc -I "%GECODEDIR%\share\minizinc\gecode" %*