diff --git a/codecs/avif/Makefile b/codecs/avif/Makefile
index 50e65254..e21b1003 100644
--- a/codecs/avif/Makefile
+++ b/codecs/avif/Makefile
@@ -6,9 +6,9 @@ CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
 
 CODEC_VERSION = "v0.8.0"
 
-LIBAOM_RELATIVE = ./ext/aom/build.libavif/
+LIBAOM_RELATIVE = ext/aom/
 LIBAOM_DIR := $(addprefix $(CODEC_DIR)/, $(LIBAOM_RELATIVE))
-LIBAOM_OUT_RELATIVE = ./libaom.a
+LIBAOM_OUT_RELATIVE = build.libavif/libaom.a
 LIBAOM_OUT := $(addprefix $(LIBAOM_DIR)/, $(LIBAOM_OUT_RELATIVE))
 
 LIBAOM_VERSION = "v2.0.0"
@@ -35,8 +35,8 @@ all: $(OUT_JS)
 
 $(LIBAOM_OUT): $(LIBAOM_DIR)
 	export CFLAGS="-w $(CFLAGS)" && \
-	mkdir -p $(LIBAOM_DIR) && \
-	cd $(LIBAOM_DIR) && \
+	mkdir -p $(LIBAOM_DIR)/build.avif && \
+	cd $(LIBAOM_DIR)/build.avif && \
 	emcmake cmake \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DENABLE_CCACHE=0 \
diff --git a/codecs/avif/enc/avif_enc.cpp b/codecs/avif/enc/avif_enc.cpp
index 02476d48..7a199eef 100644
--- a/codecs/avif/enc/avif_enc.cpp
+++ b/codecs/avif/enc/avif_enc.cpp
@@ -55,7 +55,7 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
       pixel[0] = rgba[pixelOffset * 4 + 0];
       pixel[1] = rgba[pixelOffset * 4 + 1];
       pixel[2] = rgba[pixelOffset * 4 + 2];
-      pixel[3] = rgba[pixelOffset * 4 + 0];
+      pixel[3] = rgba[pixelOffset * 4 + 3];
     }
   }
   avifImageRGBToYUV(image, &srcRGB);
diff --git a/codecs/avif/enc/avif_enc.wasm b/codecs/avif/enc/avif_enc.wasm
index bed24fd8..62ac555c 100644
Binary files a/codecs/avif/enc/avif_enc.wasm and b/codecs/avif/enc/avif_enc.wasm differ
diff --git a/src/codecs/avif/decoder.ts b/src/codecs/avif/decoder.ts
index 3f22a37f..5bbdd8b1 100644
--- a/src/codecs/avif/decoder.ts
+++ b/src/codecs/avif/decoder.ts
@@ -1,5 +1,5 @@
-import avif_dec, { AVIFModule } from '../../../codecs/avif_dec/avif_dec';
-import wasmUrl from '../../../codecs/avif_dec/avif_dec.wasm';
+import avif_dec, { AVIFModule } from '../../../codecs/avif/dec/avif_dec';
+import wasmUrl from '../../../codecs/avif/dec/avif_dec.wasm';
 import { initEmscriptenModule } from '../util';
 
 let emscriptenModule: Promise<AVIFModule>;
diff --git a/src/codecs/avif/encoder.ts b/src/codecs/avif/encoder.ts
index 790d525a..d17f2f9c 100644
--- a/src/codecs/avif/encoder.ts
+++ b/src/codecs/avif/encoder.ts
@@ -1,5 +1,5 @@
-import avif_enc, { AVIFModule } from '../../../codecs/avif_enc/avif_enc';
-import wasmUrl from '../../../codecs/avif_enc/avif_enc.wasm';
+import avif_enc, { AVIFModule } from '../../../codecs/avif/enc/avif_enc';
+import wasmUrl from '../../../codecs/avif/enc/avif_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
 import { initEmscriptenModule } from '../util';