diff --git a/config.m4 b/config.m4
index 68c98db..bb4ea04 100644
--- a/config.m4
+++ b/config.m4
@@ -84,7 +84,7 @@ if test "$PHP_GDAL" != "no"; then
   PHP_SUBST(GDAL_SHARED_LIBADD)
   PHP_ADD_LIBRARY(stdc++, 1, GDAL_SHARED_LIBADD)
   PHP_NEW_EXTENSION(gdal, php_gdal.cc gdal_main.cc cpl.cc ogr.cc ogrsfdriverregistrar.cc ogrsfdriver.cc \
-            ogrdatasource.cc ogrlayer.cc ogrgeometry.cc ogrfeaturedefn.cc ogrfielddefn.cc ogrenvelope.cc \
+            ogrdatasource.cc ogrlayer.cc ogrgeometry.cc ogrgeometryfactory.cc ogrfeaturedefn.cc ogrfielddefn.cc ogrenvelope.cc \
             ogrspatialreference.cc ogrcoordtransform.cc ogrfeature.cc gdaldrivermanager.cc gdaldriver.cc \
             gdaldataset.cc gdalrasterband.cc ogrexception.cc, $ext_shared)
 fi
diff --git a/ogrgeometryfactory.cc b/ogrgeometryfactory.cc
new file mode 100644
index 0000000..7eb191b
--- /dev/null
+++ b/ogrgeometryfactory.cc
@@ -0,0 +1,146 @@
+#include "php.h"
+#include "php_gdal.h"
+#include <zend_exceptions.h>
+#include <ogr_core.h>
+#include <cpl_conv.h>
+#include <cpl_string.h>
+#include "ogrexception.h"
+#include "ogrspatialreference.h"
+#include "ogrgeometry.h"
+#include "ogrgeometryfactory.h"
+
+zend_class_entry *gdal_ogrgeometryfactory_ce;
+zend_object_handlers ogrgeometryfactory_object_handlers;
+
+
+void ogrgeometryfactory_free_storage(void *object TSRMLS_DC)
+{
+  php_ogrgeometryfactory_object *obj = (php_ogrgeometryfactory_object *)object;
+  //delete obj->geometry; // TODO
+  zend_hash_destroy(obj->std.properties);
+  FREE_HASHTABLE(obj->std.properties);
+  efree(obj);
+}
+
+
+zend_object_value ogrgeometryfactory_create_handler(zend_class_entry *type TSRMLS_DC)
+{
+  zval *tmp;
+  zend_object_value retval;
+
+  php_ogrgeometryfactory_object *obj =
+      (php_ogrgeometryfactory_object *)emalloc(sizeof(php_ogrgeometryfactory_object));
+  memset(obj, 0, sizeof(php_ogrgeometryfactory_object));
+  obj->std.ce = type;
+
+  ALLOC_HASHTABLE(obj->std.properties);
+  zend_hash_init(obj->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+#if PHP_VERSION_ID < 50399
+  zend_hash_copy(obj->std.properties, &type->default_properties,
+                 (copy_ctor_func_t)zval_add_ref, (void *)&tmp, sizeof(zval *));
+#else
+  object_properties_init(&obj->std, type);
+#endif
+
+  retval.handle = zend_objects_store_put(obj, NULL,
+                                         ogrgeometryfactory_free_storage, NULL TSRMLS_CC);
+  retval.handlers = &ogrgeometryfactory_object_handlers;
+
+  return retval;
+}
+
+/**
+ * OGRGeometryFactory::createFromWkt(char **wkt, OGRSpatialReference *sref, OGRGeometry **outGeom)
+ */
+PHP_METHOD(OGRGeometryFactory, createFromWkt)
+{
+  char *wkt;
+  int wkt_len;
+  zval *srefp;
+
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, (char *)"s/O!",
+                            &wkt, &wkt_len,
+                            &srefp, gdal_ogrspatialreference_ce) == FAILURE)
+  {
+    return;
+  }
+
+  OGRSpatialReference *sref = NULL;
+  if(srefp != NULL) {
+    php_ogrspatialreference_object *sref_obj = (php_ogrspatialreference_object*)zend_object_store_get_object(srefp);
+    sref = sref_obj->spatialreference;
+  }
+
+  OGRGeometry *geometry;
+  OGRErr error = OGRGeometryFactory::createFromWkt(&wkt, sref, &geometry);
+
+  if (error != OGRERR_NONE) 
+  {
+    switch (error)
+    {
+      case OGRERR_NOT_ENOUGH_DATA:
+        zend_throw_exception(NULL, (char *)"OGR: Not enough data", 0 TSRMLS_CC);
+        break;
+      case OGRERR_UNSUPPORTED_GEOMETRY_TYPE:
+        zend_throw_exception(NULL, (char *)"OGR: Unsupported geometry type", 0 TSRMLS_CC);
+        break;
+      case OGRERR_CORRUPT_DATA:
+        zend_throw_exception(NULL, (char *)"OGR: Corrupt data", 0 TSRMLS_CC);
+        break;
+      default:
+        zend_throw_exception(NULL, (char *)"OGR: Unknown error deserializing WKT", 0 TSRMLS_CC);
+    }
+  }
+
+  if (!geometry)
+  {
+    RETURN_NULL();
+  }
+  if (object_init_ex(return_value, gdal_ogrgeometry_ce) != SUCCESS) {
+    OGRGeometryFactory::destroyGeometry(geometry);
+    RETURN_NULL();
+  }
+  php_ogrgeometry_object *geometry_obj = (php_ogrgeometry_object*)
+    zend_object_store_get_object(return_value TSRMLS_CC);
+  geometry_obj->geometry = geometry;
+}
+
+PHP_METHOD(OGRGeometryFactory, DestroyGeometry)
+{
+  OGRGeometry *geometry;
+  php_ogrgeometry_object *obj;
+  zval *p;
+
+  if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, (char*)"O",
+                            &p, gdal_ogrgeometry_ce) == FAILURE) {
+    return;
+  }
+
+  obj = (php_ogrgeometry_object *)zend_object_store_get_object(p);
+  if (obj) {
+    geometry = obj->geometry;
+    OGRGeometryFactory::destroyGeometry(geometry);
+  }
+}
+
+zend_function_entry ogrgeometryfactory_methods[] = {
+  PHP_ME(OGRGeometryFactory, DestroyGeometry, NULL, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+  PHP_ME(OGRGeometryFactory, createFromWkt, NULL,  ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
+  {NULL, NULL, NULL}
+};
+
+
+void php_gdal_ogrgeometryfactory_startup(INIT_FUNC_ARGS)
+{
+  zend_class_entry ce;
+  INIT_CLASS_ENTRY(ce, "OGRGeometryFactory", ogrgeometryfactory_methods);
+  gdal_ogrgeometryfactory_ce = zend_register_internal_class(&ce TSRMLS_CC);
+  gdal_ogrgeometryfactory_ce->create_object = ogrgeometryfactory_create_handler;
+  memcpy(&ogrgeometryfactory_object_handlers,
+         zend_get_std_object_handlers(), sizeof(zend_object_handlers));
+  ogrgeometryfactory_object_handlers.clone_obj = NULL;
+}
+
+
+/* VIM settings */
+/* ex: set tabstop=2 expandtab shiftwidth=2 smartindent */
diff --git a/ogrgeometryfactory.h b/ogrgeometryfactory.h
new file mode 100644
index 0000000..0f70160
--- /dev/null
+++ b/ogrgeometryfactory.h
@@ -0,0 +1,20 @@
+//
+// ogrgeometry.h
+//
+
+#ifndef PHP_OGRGEOMETRYFACTORY_H
+#define PHP_OGRGEOMETRYFACTORY_H
+
+#include <ogr_geometry.h>
+#include "php.h"
+
+extern zend_class_entry *gdal_ogrgeometryfactory_ce;
+
+struct php_ogrgeometryfactory_object {
+  zend_object std;
+  OGRGeometryFactory *geometryFactory;
+};
+
+void php_gdal_ogrgeometryfactory_startup(INIT_FUNC_ARGS);
+
+#endif /* PHP_OGRGEOMETRYFACTORY_H */
diff --git a/php_gdal.cc b/php_gdal.cc
index 27eb7e0..cb333d0 100644
--- a/php_gdal.cc
+++ b/php_gdal.cc
@@ -47,6 +47,7 @@
 #include "ogrfielddefn.h"
 #include "ogrenvelope.h"
 #include "ogrgeometry.h"
+#include "ogrgeometryfactory.h"
 #include "ogrspatialreference.h"
 #include "ogrcoordtransform.h"
 #include "ogrfeature.h"
@@ -178,6 +179,7 @@ PHP_MINIT_FUNCTION(gdal)
   php_gdal_ogrfielddefn_startup(INIT_FUNC_ARGS_PASSTHRU);
   php_gdal_ogrenvelope_startup(INIT_FUNC_ARGS_PASSTHRU);
   php_gdal_ogrgeometry_startup(INIT_FUNC_ARGS_PASSTHRU);
+  php_gdal_ogrgeometryfactory_startup(INIT_FUNC_ARGS_PASSTHRU);
   php_gdal_ogrspatialreference_startup(INIT_FUNC_ARGS_PASSTHRU);
   php_gdal_ogrcoordtransform_startup(INIT_FUNC_ARGS_PASSTHRU);
   php_gdal_ogrfeature_startup(INIT_FUNC_ARGS_PASSTHRU);