diff --git a/ChangeLog b/ChangeLog
index fafa97da485..3c887d9a5d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,9 @@
 ------------------------------------------------------------------------------
 Version 0.6 'Simon' .... development version
 QGIS Change Log
-2005-04-10 [timlinux] 0.6devel11
+2005-04-12 [timlinux] 0.6devel12
+** Fix for [ 1181249 ] Crash when loading shape files
+2005-04-11 [timlinux] 0.6devel11
 ** Data binding on projection and ellipsoid selector on custom projection
 dialog
 2005-04-11 [ges] 0.6.0devel10
diff --git a/configure.in b/configure.in
index df895acd7a7..531f977a351 100644
--- a/configure.in
+++ b/configure.in
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
 MAJOR_VERSION=0
 MINOR_VERSION=6
 MICRO_VERSION=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
 else
diff --git a/src/qgsvectorlayer.cpp b/src/qgsvectorlayer.cpp
index d1dde73c773..4efdd43ba2c 100644
--- a/src/qgsvectorlayer.cpp
+++ b/src/qgsvectorlayer.cpp
@@ -2607,9 +2607,20 @@ void QgsVectorLayer::setCoordinateSystem()
       }
       else ///qgis/projections/defaultBehaviour==useDefault
       {
-        //shamelessly hard coded for now
-        //XXX TODO get this from options dlg
-        mySourceWKT = mySettings.readEntry("/qgis/projections/defaultProjectionWKT");
+	  //default to geo / wgs84 for now 
+	  QString myGeoWKT =    "GEOGCS[\"WGS 84\", "
+	  "  DATUM[\"WGS_1984\", "
+	  "    SPHEROID[\"WGS 84\",6378137,298.257223563, "
+	  "      AUTHORITY[\"EPSG\",7030]], "
+	  "    TOWGS84[0,0,0,0,0,0,0], "
+	  "    AUTHORITY[\"EPSG\",6326]], "
+	  "  PRIMEM[\"Greenwich\",0,AUTHORITY[\"EPSG\",8901]], "
+	  "  UNIT[\"DMSH\",0.0174532925199433,AUTHORITY[\"EPSG\",9108]], "
+	  "  AXIS[\"Lat\",NORTH], "
+	  "  AXIS[\"Long\",EAST], "
+	  "  AUTHORITY[\"EPSG\",4326]]";
+        mySourceWKT = mySettings.readEntry("/qgis/projections/defaultProjectionWKT",myGeoWKT);
+	
       }
     }