diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d7188987..c457f2bd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build
         run: |
-          ./build.py --target quasi-glib
+#          ./build.py --target quasi-glib
           ./build.py --target ${{ matrix.target }} ${{ matrix.flavor.args }}
 
       - name: List Build Directory
diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py
index dfb11168..d275fe8e 100644
--- a/aedi/target/library_tier1.py
+++ b/aedi/target/library_tier1.py
@@ -507,22 +507,12 @@ class PcreTarget(ConfigureMakeStaticDependencyTarget):
         self.update_config_script(state.install_path / 'bin/pcre-config')
 
 
-class QuasiGlibTarget(BuildTarget):
+class QuasiGlibTarget(CMakeStaticDependencyTarget):
     def __init__(self, name='quasi-glib'):
         super().__init__(name)
 
-    def build(self, state: BuildState):
-        lib_path = state.install_path / 'lib'
-        os.makedirs(lib_path, exist_ok=True)
-
-        commands = (
-            [state.cxx_compiler(), '-std=c++11', '-O3', '-c', state.patch_path / f'{self.name}.cpp'] +
-            shlex.split(state.environment['CXXFLAGS']),
-            (state.host() + '-ar', '-crs', lib_path / f'lib{self.name}.a', f'{self.name}.o'),
-        )
-
-        for command in commands:
-            subprocess.run(command, check=True, cwd=state.build_path, env=state.environment)
+    def prepare_source(self, state: BuildState):
+        state.source = state.patch_path / self.name
 
 
 class SndFileTarget(CMakeStaticDependencyTarget):
diff --git a/deps/quasi-glib/lib/libquasi-glib.a b/deps/quasi-glib/lib/libquasi-glib.a
index ced36fda..9063454a 100644
Binary files a/deps/quasi-glib/lib/libquasi-glib.a and b/deps/quasi-glib/lib/libquasi-glib.a differ
diff --git a/patch/quasi-glib/CMakeLists.txt b/patch/quasi-glib/CMakeLists.txt
new file mode 100644
index 00000000..dc3ec4dc
--- /dev/null
+++ b/patch/quasi-glib/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.1)
+project(quasi-glib)
+add_library(quasi-glib quasi-glib.cpp)
+set_property(TARGET quasi-glib PROPERTY CXX_STANDARD 11)
+install(TARGETS quasi-glib)
diff --git a/patch/quasi-glib.cpp b/patch/quasi-glib/quasi-glib.cpp
similarity index 100%
rename from patch/quasi-glib.cpp
rename to patch/quasi-glib/quasi-glib.cpp