diff --git a/dependencies.py b/dependencies.py
index a26af48..3588031 100644
--- a/dependencies.py
+++ b/dependencies.py
@@ -196,6 +196,23 @@ class MicroHttpd(Dependency):
         configure_option = "--disable-https --without-libgcrypt --without-libcurl"
 
 
+class Gumbo(Dependency):
+    name = "gumbo"
+    version = "0.10.1"
+
+    class Source(ReleaseDownload):
+        archive = Remotefile('gumbo-0.10.1.tar.gz',
+                             '28463053d44a5dfbc4b77bcf49c8cee119338ffa636cc17fc3378421d714efad',
+                             'https://github.com/google/gumbo-parser/archive/v0.10.1.tar.gz')
+
+        def _post_prepare_script(self, context):
+            context.try_skip(self.extract_path)
+            command = "./autogen.sh"
+            self.buildEnv.run_command(command, self.extract_path, context)
+
+    Builder = MakeBuilder
+
+
 class Icu(Dependency):
     name = "icu4c"
     version = "58.2"
@@ -280,11 +297,11 @@ class ZimTools(Dependency):
 
 class Zimwriterfs(Dependency):
     name = "zimwriterfs"
-    extra_packages = ['file', 'gumbo']
+    extra_packages = ['file']
 
     @property
     def dependencies(self):
-        base_dependencies = ['libzim', 'zlib', 'lzma', 'xapian-core']
+        base_dependencies = ['libzim', 'zlib', 'lzma', 'xapian-core', 'gumbo']
         if self.buildEnv.platform_info.build != 'native':
             return base_dependencies + ["icu4c_cross-compile"]
         else:
diff --git a/dependency_utils.py b/dependency_utils.py
index b423597..0cd4ed3 100644
--- a/dependency_utils.py
+++ b/dependency_utils.py
@@ -118,6 +118,8 @@ class ReleaseDownload(Source):
         self.command('extract', self._extract)
         if hasattr(self, 'patches'):
             self.command('patch', self._patch)
+        if hasattr(self, '_post_prepare_script'):
+            self.command('post_prepare_script', self._post_prepare_script)
 
 
 class GitClone(Source):