diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19b01ad12..1ab3c2306 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ For a complete change history, see the SVN log.
 
 ## Mapnik 2.1.0
 
+- Improved logging/debugging system with release logs and file redirection (#937 and partially #986, #467)
+
 - GDAL: allow setting nodata value on the fly (will override value if nodata is set in data) (#1161)
  
 - GDAL: respect nodata for paletted/colormapped images (#1160)
diff --git a/plugins/input/geos/geos_datasource.cpp b/plugins/input/geos/geos_datasource.cpp
index e022209aa..736b03e62 100644
--- a/plugins/input/geos/geos_datasource.cpp
+++ b/plugins/input/geos/geos_datasource.cpp
@@ -65,24 +65,28 @@ DATASOURCE_PLUGIN(geos_datasource)
 
 void geos_notice(const char* format, ...)
 {
+#ifdef MAPNIK_LOG
     char buffer[512];
     va_list args;
     va_start(args, format);
-    vsprintf(buffer, format, args);
+    vsnprintf(buffer, 512, format, args);
     va_end(args);
 
     MAPNIK_LOG_WARN(geos) << "geos_datasource: " << buffer;
+#endif
 }
 
 void geos_error(const char* format, ...)
 {
+#ifdef MAPNIK_LOG
     char buffer[512];
     va_list args;
     va_start(args, format);
-    vsprintf(buffer, format, args);
+    vsnprintf(buffer, 512, format, args);
     va_end(args);
 
     MAPNIK_LOG_ERROR(geos) << "geos_datasource: " << buffer;
+#endif
 }
 
 
diff --git a/workspace/mapnik.pro b/workspace/mapnik.pro
index f74500532..ce6f36356 100644
--- a/workspace/mapnik.pro
+++ b/workspace/mapnik.pro
@@ -316,7 +316,8 @@ SOURCES += \
 
 OTHER_FILES += \
     ../SConstruct \
-    ../config.py
+    ../config.py \
+    ../CHANGELOG.md
 
 include(agg.pri)
 include(plugins.pri)