diff --git a/apache2/Makefile.win b/apache2/Makefile.win
index dea150ac..fe4a70ac 100644
--- a/apache2/Makefile.win
+++ b/apache2/Makefile.win
@@ -38,6 +38,13 @@ DEFS=$(DEFS) -DWITH_LUA
 INCLUDES = $(INCLUDES) -I$(LUA)\include -I$(LUA) \
 !ENDIF
 
+# Yajl/Json is optional
+!IF "$(YAJL)" != ""
+LIBS = $(LIBS) $(YAJL)\yajl.lib
+DEFS=$(DEFS) -DWITH_YAJL
+INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \
+!ENDIF
+
 CFLAGS= -MD $(INCLUDES) $(DEFS)
 
 LDFLAGS =
@@ -48,7 +55,8 @@ OBJS = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_crypt.obj msc_tree.obj msc_unicode.obj acmp.obj msc_lua.obj \
        msc_release.obj libinjection\libinjection_sqli.obj \
-       msc_status_engine.obj
+       msc_status_engine.obj \
+       msc_json.obj
 
 all: $(DLL)
 
diff --git a/iis/Makefile.win b/iis/Makefile.win
index acb24dcc..8e81c287 100644
--- a/iis/Makefile.win
+++ b/iis/Makefile.win
@@ -41,6 +41,13 @@ DEFS=$(DEFS) -DWITH_LUA
 INCLUDES = $(INCLUDES) -I$(LUA)\include -I$(LUA) \
 !ENDIF
 
+# Yajl/Json is optional
+!IF "$(YAJL)" != ""
+LIBS = $(LIBS) $(YAJL)\yajl.lib
+DEFS=$(DEFS) -DWITH_YAJL
+INCLUDES = $(INCLUDES) -I$(YAJL)\include -I$(YAJL) \
+!ENDIF
+
 CFLAGS= -MD /Zi $(INCLUDES) $(DEFS)
 
 LDFLAGS = /DEF:"mymodule.def" /DEBUG /OPT:REF /OPT:ICF /MANIFEST /ManifestFile:"ModSecurityIIS.dll.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /TLBID:1 /DYNAMICBASE /NXCOMPAT
@@ -51,7 +58,8 @@ OBJS1 = mod_security2.obj apache2_config.obj apache2_io.obj apache2_util.obj \
        msc_parsers.obj msc_util.obj msc_pcre.obj persist_dbm.obj \
        msc_reqbody.obj msc_geo.obj msc_gsb.obj msc_unicode.obj acmp.obj msc_lua.obj \
        msc_release.obj msc_crypt.obj msc_tree.obj \
-       msc_status_engine.obj
+       msc_status_engine.obj \
+       msc_json.obj
 OBJS2 = api.obj buckets.obj config.obj filters.obj hooks.obj regex.obj server.obj
 OBJS3 = main.obj moduleconfig.obj mymodule.obj
 OBJS4 = libinjection_sqli.obj
diff --git a/nginx/modsecurity/config.in b/nginx/modsecurity/config.in
index 4918224c..753dbd6e 100644
--- a/nginx/modsecurity/config.in
+++ b/nginx/modsecurity/config.in
@@ -7,7 +7,8 @@ CFLAGS="$CFLAGS \
     @LIBXML2_CFLAGS@ \
     @LUA_CFLAGS@ \
     @MODSEC_EXTRA_CFLAGS@ \
-    @PCRE_CFLAGS@"
+    @PCRE_CFLAGS@ \
+    @YAJL_CFLAGS@"
 
 
 CORE_LIBS="$CORE_LIBS \
@@ -18,7 +19,8 @@ CORE_LIBS="$CORE_LIBS \
     @LIBXML2_LDADD@ \
     @LUA_LDADD@ \
     @PCRE_LDADD@ \
-    @APXS_LIBS@"
+    @APXS_LIBS@ \
+    @YAJL_LIBS@"
 
 ngx_addon_name=ngx_http_modsecurity
 
diff --git a/standalone/Makefile.am b/standalone/Makefile.am
index f801d97c..13166beb 100644
--- a/standalone/Makefile.am
+++ b/standalone/Makefile.am
@@ -13,6 +13,7 @@ standalone_la_SOURCES = ../apache2/acmp.c \
     ../apache2/msc_crypt.c \
     ../apache2/msc_geo.c \
     ../apache2/msc_gsb.c \
+    ../apache2/msc_json.c \
     ../apache2/msc_logging.c \
     ../apache2/msc_lua.c \
     ../apache2/msc_multipart.c \