diff --git a/cli/Makefile b/cli/Makefile
index 5b7d2a2d..93d1e39b 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -87,6 +87,13 @@ ifeq ($(VGM_ENABLE_ATRAC9),1)
   TARGET_EXT_LIBS += libatrac9.a
 endif
 
+VGM_ENABLE_CELT = 1
+ifeq ($(VGM_ENABLE_CELT),1) 
+  CFLAGS  += -DVGM_USE_CELT
+  LDFLAGS += -lcelt-0061 -lcelt-0110
+  TARGET_EXT_LIBS += libcelt-0061.a libcelt-0110.a
+endif
+
 endif #if WIN32
 
 export CFLAGS LDFLAGS
diff --git a/ext_libs/Makefile b/ext_libs/Makefile
index 3b9310d8..af644561 100644
--- a/ext_libs/Makefile
+++ b/ext_libs/Makefile
@@ -35,7 +35,13 @@ libswresample.a: swresample-vgmstream-3.dll swresample-vgmstream-3.def
 libatrac9.a: libatrac9.dll libatrac9.def
 	$(DLLTOOL) -D libatrac9.dll -d libatrac9.def -l libatrac9.a
 
+libcelt-0061.a: libcelt-0061.dll libcelt-0061.def
+	$(DLLTOOL) -D libcelt-0061.dll -d libcelt-0061.def -l libcelt-0061.a
+
+libcelt-0110.a: libcelt-0110.dll libcelt-0110.def
+	$(DLLTOOL) -D libcelt-0110.dll -d libcelt-0110.def -l libcelt-0110.a
+
 clean:
-	$(RMF) libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libavcodec.a libavformat.a libavutil.a libswresample.a libatrac9.a
+	$(RMF) libvorbis.a libmpg123-0.a libg7221_decode.a libg719_decode.a libavcodec.a libavformat.a libavutil.a libswresample.a libatrac9.a libcelt-0061.a libcelt-0110.a
 
 .PHONY: clean
diff --git a/winamp/Makefile b/winamp/Makefile
index 4b578a02..d1251d92 100644
--- a/winamp/Makefile
+++ b/winamp/Makefile
@@ -71,6 +71,13 @@ ifeq ($(VGM_ENABLE_ATRAC9),1)
   TARGET_EXT_LIBS += libatrac9.a
 endif
 
+VGM_ENABLE_CELT = 1
+ifeq ($(VGM_ENABLE_CELT),1) 
+  CFLAGS  += -DVGM_USE_CELT
+  LDFLAGS += -lcelt-0061 -lcelt-0110
+  TARGET_EXT_LIBS += libcelt-0061.a libcelt-0110.a
+endif
+
 endif #if WIN32
 
 export CFLAGS LDFLAGS
diff --git a/xmplay/Makefile b/xmplay/Makefile
index cd762f69..4253c275 100644
--- a/xmplay/Makefile
+++ b/xmplay/Makefile
@@ -71,6 +71,13 @@ ifeq ($(VGM_ENABLE_ATRAC9),1)
   TARGET_EXT_LIBS += libatrac9.a
 endif
 
+VGM_ENABLE_CELT = 1
+ifeq ($(VGM_ENABLE_CELT),1) 
+  CFLAGS  += -DVGM_USE_CELT
+  LDFLAGS += -lcelt-0061 -lcelt-0110
+  TARGET_EXT_LIBS += libcelt-0061.a libcelt-0110.a
+endif
+
 endif #if WIN32
 
 export CFLAGS LDFLAGS