diff --git a/aedi/target/tool_tier2.py b/aedi/target/tool_tier2.py
index b172d50e..b34c34c0 100644
--- a/aedi/target/tool_tier2.py
+++ b/aedi/target/tool_tier2.py
@@ -150,6 +150,40 @@ class GlslangTarget(base.CMakeStaticDependencyTarget):
                 os.unlink(lib_cmake_path / entry)
 
 
+class GraphvizTarget(base.CMakeStaticDependencyTarget):
+    def __init__(self, name='graphviz'):
+        super().__init__(name)
+
+    def prepare_source(self, state: BuildState):
+        state.download_source(
+            'https://gitlab.com/graphviz/graphviz/-/archive/8.1.0/graphviz-8.1.0.tar.bz2',
+            'ce8911695752aa2c3929147e3dee016e58aa624d81d7c18dd16f895ae79460de')
+
+    def configure(self, state: BuildState):
+        opts = state.options
+        opts['enable_ltdl'] = 'NO'
+        opts['with_gvedit'] = 'NO'
+
+        super().configure(state)
+
+
+class M4Target(base.ConfigureMakeDependencyTarget):
+    def __init__(self, name='m4'):
+        super().__init__(name)
+
+    def prepare_source(self, state: BuildState):
+        state.download_source(
+            'https://ftp.gnu.org/gnu/m4/m4-1.4.19.tar.xz',
+            '63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96')
+
+        def configure(self, state: BuildState):
+            opts = state.options
+            opts['enable_ltdl'] = 'NO'
+            opts['with_gvedit'] = 'NO'
+
+            super().configure(state)
+
+
 class P7ZipTarget(base.CMakeTarget):
     def __init__(self, name='p7zip'):
         super().__init__(name)