diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index c42103810e..90efe6c79b 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -42,7 +42,7 @@ endif
 romstage-y += memcmp.c
 rmodules-y += memcmp.c
 romstage-y += cbfs.c
-romstage-y += lzma.c
+romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c
 #romstage-y += lzmadecode.c
 romstage-$(CONFIG_CACHE_AS_RAM) += ramtest.c
 romstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250.c
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index f48d887d87..4ccc9e6c30 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -29,6 +29,8 @@
 # define CBFS_MINI_BUILD
 #elif defined(__BOOT_BLOCK__)
   /* No LZMA in boot block. */
+#elif defined(__PRE_RAM__) && !CONFIG_COMPRESS_RAMSTAGE
+  /* No LZMA in romstage if ramstage is not compressed. */
 #else
 # define CBFS_CORE_WITH_LZMA
 # include <lib.h>