diff --git a/firmware/SOURCES b/firmware/SOURCES
index 4ffb12abb0..352e44d9a2 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -612,7 +612,7 @@ target/arm/as3525/lcd-fuze.c
 target/arm/ipod/lcd-color_nano.c
 #elif CONFIG_LCD == LCD_IPODMINI || CONFIG_LCD == LCD_IPOD2BPP
 target/arm/ipod/lcd-gray.c
-#elif defined(GIGABEAT_S) /* FIXME: LCD_GIGABEAT */
+#elif CONFIG_LCD == LCD_GIGABEATS
 target/arm/imx31/gigabeat-s/lcd-gigabeat-s.c
 #elif CONFIG_LCD == LCD_GIGABEAT
 target/arm/s3c2440/lcd-s3c2440.c
diff --git a/firmware/export/config.h b/firmware/export/config.h
index de47e5ebc3..039b48a759 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -231,6 +231,7 @@
 #define LCD_CLIPZIP   43 /* as used by the Sandisk Sansa Clip Zip */
 #define LCD_HX8340B   44 /* as used by the HiFiMAN HM-601/HM-602/HM-801 */
 #define LCD_CONNECT   45 /* as used by the Sandisk Sansa Connect */
+#define LCD_GIGABEATS 46
 
 /* LCD_PIXELFORMAT */
 #define HORIZONTAL_PACKING 1
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index dbeff4aa04..0171dd8942 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -230,7 +230,7 @@
 /* Define this to add support for ATA DMA */
 #define HAVE_ATA_DMA
 
-#define CONFIG_LCD LCD_GIGABEAT
+#define CONFIG_LCD LCD_GIGABEATS
 
 /* Offset ( in the firmware file's header ) to the file CRC */
 #define FIRMWARE_OFFSET_FILE_CRC 0