diff --git a/build/windows/jhbuild/build.jhbuildrc b/build/windows/jhbuild/build.jhbuildrc
index 9f3abdb4a6..9b60a713be 100644
--- a/build/windows/jhbuild/build.jhbuildrc
+++ b/build/windows/jhbuild/build.jhbuildrc
@@ -242,6 +242,8 @@ module_extra_env.update (
     {'LIBPNG_CFLAGS': ' ', 'LIBPNG_LDFLAGS': '-lpng'},
  'cairo':
     {'ax_cv_c_float_words_bigendian': 'no'},
+  'json-c':
+    {'ac_cv_func_malloc_0_nonnull': 'yes', 'ac_cv_func_realloc_0_nonnull': 'yes'}, # Erm... this is potentially bad...
 
 # Ensure that gimp doesn't get the host machine's freetype-config
   'gimp-dev':
diff --git a/build/windows/jhbuild/gimp.moduleset b/build/windows/jhbuild/gimp.moduleset
index 04f2d95375..e457b8c3fb 100644
--- a/build/windows/jhbuild/gimp.moduleset
+++ b/build/windows/jhbuild/gimp.moduleset
@@ -67,6 +67,7 @@
 		<dep package="gimp-common"/>
 		<dep package="lcms2"/>
 		<dep package="libgexiv2"/>
+		<dep package="libmypaint"/>
 		<dep package="gegl"/>
 		<dep package="gnome-icon-theme"/>
 	</dependencies>
diff --git a/build/windows/jhbuild/misclibs.moduleset b/build/windows/jhbuild/misclibs.moduleset
index 076efb2404..019f178f78 100644
--- a/build/windows/jhbuild/misclibs.moduleset
+++ b/build/windows/jhbuild/misclibs.moduleset
@@ -14,6 +14,10 @@
 		href="http://poppler.freedesktop.org/" />
 	<repository type="tarball" name="exiv2"
 		href="http://www.exiv2.org/" />
+	<repository type="tarball" name="json-c"
+		href="https://s3.amazonaws.com/json-c_releases/releases/" />
+	<repository type="git" name="github"
+		href="https://github.com/"/>
 
 	<include href="gtk+.moduleset"/>
 
@@ -194,4 +198,22 @@
 	</dependencies>
 </autotools>
 
+<autotools id="json-c" autogen-sh="configure">
+	<branch version="0.12" repo="json-c"
+			module="json-c-0.12-nodoc.tar.gz"
+			checkoutdir="json-c-0.12-nodoc"
+			hash="sha256:6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35">
+		<!-- Local patch: -->
+		<patch file="json-c-disable-werror.patch" strip="1"/>
+	</branch>
+</autotools>
+
+<autotools id="libmypaint" autogen-sh="autogen.sh &amp;&amp; ./configure">
+	<branch repo="github" module="mypaint/libmypaint.git"/>
+	<dependencies>
+		<dep package="json-c"/>
+		<dep package="gettext"/>
+	</dependencies>
+</autotools>
+
 </moduleset>
diff --git a/build/windows/jhbuild/patches/json-c-disable-werror.patch b/build/windows/jhbuild/patches/json-c-disable-werror.patch
new file mode 100644
index 0000000000..3c4db96f1c
--- /dev/null
+++ b/build/windows/jhbuild/patches/json-c-disable-werror.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in	2015-03-30 20:34:35.930327000 -0400
++++ b/Makefile.in	2015-03-30 20:34:49.070330097 -0400
+@@ -378,7 +378,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
+ EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
+ SUBDIRS = . tests
+ lib_LTLIBRARIES = libjson-c.la