diff --git a/Graphics/gl2jpeg.cpp b/Graphics/gl2jpeg.cpp
index 190796d6be061546606c08609646bd82b8a3ff58..639beeefd05366f3dc8f96bec742ea136351e950 100644
--- a/Graphics/gl2jpeg.cpp
+++ b/Graphics/gl2jpeg.cpp
@@ -16,16 +16,6 @@ void create_jpeg(FILE *outfile, PixelBuffer *buffer, int quality, int smoothing)
 
 #else
 
-/* Some releases of the Cygwin JPEG libraries (as well as the JPEG
-   library bundled with FLTK) don't have a correctly updated header
-   file for the INT32 data type; the following define from Shane Hill
-   seems to be a usable workaround... */
-
-#if defined(WIN32)
-#define XMD_H
-#define boolean char
-#endif
-
 extern "C"
 {
 #include <jpeglib.h>
diff --git a/Makefile b/Makefile
index 5d7bf0d13aac592fd1acf7108f6b5509b51e7c79..d26d7858cec5d6387ca5c5556a03e93c3a8bbf0d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ include variables
 GMSH_MAJOR_VERSION = 2
 GMSH_MINOR_VERSION = 3
 GMSH_PATCH_VERSION = 1
-GMSH_EXTRA_VERSION = "-cvs-20090603"
+GMSH_EXTRA_VERSION = ""
 
 GMSH_VERSION =\
   ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}