diff --git a/Makefile b/Makefile
index 555ecaa..9fcbc7f 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ DEFAULT_LANG =
 
 PIC_COMMON   = back.jpg
 
-FILES_CORE   = init languages
+FILES_CORE   = init
 
-INST_EXT     = $(TRANSLATIONS) 16x16.fnt $(PIC_COMMON)
+INST_EXT     = langlist $(TRANSLATIONS) 16x16.fnt $(PIC_COMMON)
 
 FILES_INST   = $(FILES_CORE) $(INST_EXT)
 
-FILES_BOOT   = $(FILES_CORE) $(TRANSLATIONS) 16x16.fnt \
+FILES_BOOT   = $(FILES_CORE) langlist $(TRANSLATIONS) 16x16.fnt \
 	       $(PIC_COMMON)
 
 FILES_BOOT_EN = $(FILES_CORE) en.tr 16x16.fnt $(PIC_COMMON)
@@ -41,11 +41,11 @@ themes: bootdir installdir
 bootdir: boot.config boot $(INCLUDES)
 	@cp -a po/*.tr boot
 	@for i in $(FILES_BOOT) ; do [ -f $$i ] && cp $$i boot ; done ; true
-	@echo en >boot/languages
+	@echo en >boot/langlist
 	$(MKBOOTMSG) $(BFLAGS) -l boot/log -c $< boot/init
 ifdef DEFAULT_LANG
 	@echo $(DEFAULT_LANG) >boot/lang
-	@echo $(DEFAULT_LANG) >>boot/languages
+	@echo $(DEFAULT_LANG) >>boot/langlist
 endif
 	@cd boot && echo $(FILES_BOOT_EN) | sed -e "s/ /\n/g" | cpio --quiet -o >message
 
@@ -66,7 +66,7 @@ font:
 	`./keymapchars keymap.*.inc` \
 	-t tmp.txt \
 	-t install/log -t boot/log \
-	-t languages -t dia_lang.inc \
+	-t langlist -t dia_lang.inc \
 	-f -gnu-unifont-medium-r-normal--16-160-75-75-c-80-iso10646-1 \
 	--fsize 16,5 \
 	16x16.fnt >16x16.fnt.log
diff --git a/debian/changelog b/debian/changelog
index b0e4b8f..a0671be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gfxboot-theme-ubuntu (0.1.8) UNRELEASED; urgency=low
+
+  * Rename languages to langlist to avoid running into 8.3 file name
+    restrictions on ISO9660.
+  * Remove langlist from the bootlogo file and just include it on the file
+    system.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 20 Jan 2006 12:06:34 +0000
+
 gfxboot-theme-ubuntu (0.1.7) dapper; urgency=low
 
   * Move boot option menu up 32 pixels and allow two more menu entries to be
diff --git a/debian/rules b/debian/rules
index 9d1f06f..334cc64 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	install -m644 Makefile languages *.config *.fnt *.inc *.jpg \
+	install -m644 Makefile langlist *.config *.fnt *.inc *.jpg \
 		$(themedir)
 	install -m755 keymapchars $(themedir)
 	install -m644 install/bootlogo.tar.gz $(themedir)
diff --git a/dia_lang.inc b/dia_lang.inc
index 40bb814..c19d053 100644
--- a/dia_lang.inc
+++ b/dia_lang.inc
@@ -9,7 +9,7 @@
 % Some global vars.
 %
 
-% fallback if there is no "languages"
+% fallback if there is no "langlist"
 /lang.items [ "en" ] def
 /lang.names [ "English" ] def
 
@@ -91,14 +91,14 @@
 
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-% Parse "languages" file.
+% Parse "langlist" file.
 %
 % ( ) ==> ( )
 %
 /lang.parsedata {
   /lang.default 0 def
 
-  "languages" findfile dup { /lang.data exch def } { pop return } ifelse
+  "langlist" findfile dup { /lang.data exch def } { pop return } ifelse
 
   /la.tmp.datalen lang.data length def
   /la.tmp.str lang.data cvs def
diff --git a/languages b/langlist
similarity index 100%
rename from languages
rename to langlist