diff --git a/firmware/application/CMakeLists.txt b/firmware/application/CMakeLists.txt
index 0243f7603..cb4aa6d91 100644
--- a/firmware/application/CMakeLists.txt
+++ b/firmware/application/CMakeLists.txt
@@ -122,6 +122,7 @@ set(CPPSRC
 	clock_manager.cpp
 	si5351.cpp
 	${COMMON}/wm8731.cpp
+	${COMMON}/ak4951.cpp
 	radio.cpp
 	baseband_cpld.cpp
 	tuning.cpp
diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
index eef2121a5..d46b1a64a 100644
--- a/firmware/application/portapack.cpp
+++ b/firmware/application/portapack.cpp
@@ -36,6 +36,9 @@ using namespace hackrf::one;
 #include "wm8731.hpp"
 using wolfson::wm8731::WM8731;
 
+#include "ak4951.hpp"
+using asahi_kasei::ak4951::AK4951;
+
 #include "cpld_update.hpp"
 
 #include "optional.hpp"
@@ -67,6 +70,7 @@ ClockManager clock_manager {
 };
 
 WM8731 audio_codec_wm8731 { i2c0, 0x1a };
+AK4951 audio_codec_ak4951 { i2c0, 0x12 };
 
 ReceiverModel receiver_model;
 
@@ -180,7 +184,11 @@ void init() {
 
 	portapack::io.init();
 
-	audio::init(&audio_codec_wm8731);
+	if( portapack_model() == PortaPackModel::R2_20170522 ) {
+		audio::init(&audio_codec_ak4951);
+	} else {
+		audio::init(&audio_codec_wm8731);
+	}
 	
 	clock_manager.enable_first_if_clock();
 	clock_manager.enable_second_if_clock();