diff --git a/CHANGES b/CHANGES
index fa65dff0a2..56710badf3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.2-93 | 2014-01-13 09:16:51 -0800
+
+  * Fixing compile problems with some versions of libc++. Reported by
+    Craig Leres. (Robin Sommer)
+
 2.2-91 | 2014-01-13 01:33:28 -0800
 
   * Improve GeoIP City database support. When trying to open a city
diff --git a/VERSION b/VERSION
index 99a02e4a0e..dfb637a2d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2-91
+2.2-93
diff --git a/src/input/readers/Raw.cc b/src/input/readers/Raw.cc
index 0b69045fa0..53469335a2 100644
--- a/src/input/readers/Raw.cc
+++ b/src/input/readers/Raw.cc
@@ -365,7 +365,7 @@ bool Raw::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fie
 		fname = source.substr(0, fname.length() - 1);
 		}
 
-	map<const char*, const char*>::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
+	ReaderInfo::config_map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
 	if ( it != info.config.end() )
 		{
 		stdin_string = it->second;
diff --git a/src/input/readers/SQLite.cc b/src/input/readers/SQLite.cc
index d02cc17fc7..794b8059ba 100644
--- a/src/input/readers/SQLite.cc
+++ b/src/input/readers/SQLite.cc
@@ -85,7 +85,7 @@ bool SQLite::DoInit(const ReaderInfo& info, int arg_num_fields, const threading:
 	fullpath.append(".sqlite");
 
 	string query;
-	map<const char*, const char*>::const_iterator it = info.config.find("query");
+	ReaderInfo::config_map::const_iterator it = info.config.find("query");
 	if ( it == info.config.end() )
 		{
 		Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source));
diff --git a/src/logging/writers/SQLite.cc b/src/logging/writers/SQLite.cc
index 46d1f17130..25f5cb012e 100644
--- a/src/logging/writers/SQLite.cc
+++ b/src/logging/writers/SQLite.cc
@@ -126,7 +126,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
 	fullpath.append(".sqlite");
 	string tablename;
 
-	map<const char*, const char*>::const_iterator it = info.config.find("tablename");
+	WriterInfo::config_map::const_iterator it = info.config.find("tablename");
 	if ( it == info.config.end() )
 		{
 		MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path));