diff --git a/packages/curl/pkgbuild.py b/packages/curl/pkgbuild.py
new file mode 100644
index 0000000..23b94d0
--- /dev/null
+++ b/packages/curl/pkgbuild.py
@@ -0,0 +1,102 @@
+from lib import cpp, arch
+from lib.make import *
+
+version("8.21.0")
+source_url("https://curl.se/download/curl-8.21.0.tar.gz")
+
+builddep("shortcut/c")
+builddep("shortcut/autotools")
+builddep(f"libnghttp2-dev @{arch.get_target()}")
+builddep(f"libcares-dev @{arch.get_target()}")
+builddep(f"aws-lc-dev @{arch.get_target()}")
+builddep(f"libbrotli-dev @{arch.get_target()}")
+builddep(f"libz-dev @{arch.get_target()}")
+builddep(f"libzstd-dev @{arch.get_target()}")
+builddep(f"libpsl-dev @{arch.get_target()}")
+
+def build():
+    cpp.configure(
+        [
+            "--prefix=/",
+            f"--bindir={get_prefix('curl')}/bin",
+            f"--libdir={get_prefix('libcurl')}/lib",
+            f"--includedir={get_prefix('libcurl-dev')}/include",
+            "--enable-optimize",
+            "--disable-debug",
+            "--enable-warnings",
+            "--enable-symbol-hiding",
+            "--enable-ares",
+            "--enable-http",
+            "--enable-ftp",
+            "--enable-file",
+            "--enable-ipfs",
+            "--disable-ldap",
+            "--disable-ldaps",
+            "--enable-rtsp",
+            "--enable-proxy",
+            "--enable-dict",
+            "--enable-telnet",
+            "--enable-tftp",
+            "--enable-pop3",
+            "--enable-imap",
+            "--enable-smb",
+            "--enable-smtp",
+            "--enable-gopher",
+            "--enable-mqtt",
+            "--disable-init-mem-debug",
+            "--enable-manual",
+            "--enable-docs",
+            "--enable-libcurl-option",
+            "--enable-ipv6",
+            "--enable-openssl-auto-load-config",
+            "--enable-ca-native",
+            "--enable-versioned-symbols",
+            "--enable-typecheck",
+            "--enable-verbose",
+            "--disable-tls-srp",
+            "--enable-unix-sockets",
+            "--enable-cookies",
+            "--enable-socketpair",
+            "--enable-http-auth",
+            "--enable-doh",
+            "--enable-mime",
+            "--enable-bindlocal",
+            "--enable-form-api",
+            "--enable-dateparse",
+            "--enable-netrc",
+            "--enable-progress-meter",
+            "--enable-get-easy-options",
+            "--enable-alt-svc",
+            "--enable-headers-api",
+            "--enable-hsts",
+            "--enable-websockets",
+            "--with-openssl",
+            "--with-nghttp2",
+            "--without-libidn2",
+        ]
+    )
+    cpp.make()
+    cpp.make_install()
+
+
+on_build(build)
+
+package("libcurl")
+dep("semi-libc @same-arch")
+dep("libpsl @same-arch")
+dep("libz @same-arch")
+dep("libcares @same-arch")
+dep("libnghttp2 @same-arch")
+dep("libssl @same-arch")
+dep("libcrypto @same-arch")
+dep("libzstd @same-arch")
+dep("libbrotli @same-arch")
+cpp.use_auto_pack(["lib"])
+
+package("curl")
+dep("libcurl (same)")
+cpp.use_auto_pack(["bin"])
+
+package("libcurl-dev")
+dep("libcurl (same)")
+cpp.use_auto_pack(["dev"])
diff --git a/packages/llvm-project/pkgbuild.py b/packages/llvm-project/pkgbuild.py
index d5c9ce5..96f495d 100644
--- a/packages/llvm-project/pkgbuild.py
+++ b/packages/llvm-project/pkgbuild.py
@@ -212,7 +212,7 @@ def install_wrapper(composer, name: str, dst: str):
         s = f.read()
     s = s.replace("LLVM_VERSION=", f"LLVM_VERSION={upstream_version}").replace(
         "ARCHITECTURE=", "ARCHITECTURE=" + arch.get_target()
-    )
+    ).replace("LLVM_ARCH=", "LLVM_ARCH=" + llvm_host_triple())
     with open(f"{composer.workdir}/bundle/{dst}", "w") as f:
         f.write(s)
     os.chmod(f"{composer.workdir}/bundle/{dst}", 0o755)
diff --git a/packages/llvm-project/wrapper/clang++.wrapper b/packages/llvm-project/wrapper/clang++.wrapper
index 214df0f..bcc1b79 100644
--- a/packages/llvm-project/wrapper/clang++.wrapper
+++ b/packages/llvm-project/wrapper/clang++.wrapper
@@ -2,12 +2,14 @@
 
 LLVM_VERSION=
 ARCHITECTURE=
+LLVM_ARCH=
 
 CLANG=$(packie print package.prefix."clang (=${LLVM_VERSION}) @${ARCHITECTURE}")/bin/llvm-clang
 
 exec ${CLANG} \
     -Wno-unused-command-line-argument \
     -isystem /lib/${ARCHITECTURE}/include/c++/v1 \
+    -isystem /lib/${ARCHITECTURE}/include/${LLVM_ARCH}/c++/v1 \
     -isystem /lib/${ARCHITECTURE}/include \
     -stdlib=libc++ \
     -rtlib=compiler-rt \