diff --git a/fltk.list.in b/fltk.list.in
index 599062184..341972001 100644
--- a/fltk.list.in
+++ b/fltk.list.in
@@ -33,13 +33,11 @@
 %license COPYING
 %readme README
 %version @FL_MAJOR_VERSION@.@FL_MINOR_VERSION@.@FL_PATCH_VERSION@
-%description << EOF
-The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
-cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
-Microsoft(r) Windows(r), and MacOS(r) X.  FLTK provides modern
-GUI functionality without the bloat and supports 3D graphics via
-OpenGL(r) and its built-in GLUT emulation.
-EOF
+%description The Fast Light Tool Kit ("FLTK", pronounced "fulltick") is a
+%description cross-platform C++ GUI toolkit for UNIX(r)/Linux(r) (X11),
+%description Microsoft(r) Windows(r), and MacOS(r) X.  FLTK provides modern
+%description GUI functionality without the bloat and supports 3D graphics via
+%description OpenGL(r) and its built-in GLUT emulation.
 
 $prefix=@prefix@
 $exec_prefix=@exec_prefix@
@@ -111,11 +109,9 @@ f 0555 root sys $libdir/libfltk_gl.so.@FL_API_VERSION@ src/libfltk_gl.so.@FL_API
 
 %subpackage devel
 %description FLTK Development Environment
-%description << EOF
-Install fltk-devel if you need to develop FLTK applications. 
-You'll need to install the fltk package if you plan to run
-dynamically linked applications.
-EOF
+%description Install fltk-devel if you need to develop FLTK applications. 
+%description You'll need to install the fltk package if you plan to run
+%description dynamically linked applications.
 
 %system darwin
 f 0444 root sys $includedir/FL/mac.r FL/mac.r
@@ -362,41 +358,40 @@ f 0444 root sys $docdir/examples/ test/*.fl
 f 0444 root sys $docdir/examples/ test/*.h
 
 %subpackage games
-%description <<EOF
-Install fltk-games to play checkers or Sudoku on your computer.
-EOF
+%description FLTK Games
+%description Install fltk-games to play checkers or Sudoku on your computer.
 
 %system darwin
 d 0555 root sys /Applications/checkers.app -
 d 0555 root sys /Applications/checkers.app/Contents -
-f 0444 root sys /Applications/checkers.app/Contents/Info.plist checkers/checkers.app/Contents/Info.plist
-f 0444 root sys /Applications/checkers.app/Contents/PkgInfo checkers/checkers.app/Contents/PkgInfo
+f 0444 root sys /Applications/checkers.app/Contents/Info.plist test/checkers.app/Contents/Info.plist
+f 0444 root sys /Applications/checkers.app/Contents/PkgInfo test/checkers.app/Contents/PkgInfo
 d 0555 root sys /Applications/checkers.app/Contents/MacOS -
 f 0555 root sys /Applications/checkers.app/Contents/MacOS/checkers test/checkers
 d 0555 root sys /Applications/checkers.app/Contents/Resources -
-f 0444 root sys /Applications/checkers.app/Contents/Resources/checkers.icns checkers/checkers.app/Contents/Resources/checkers.icns
+f 0444 root sys /Applications/checkers.app/Contents/Resources/checkers.icns test/checkers.app/Contents/Resources/checkers.icns
 %postremove /bin/rm -rf /Applications/checkers.app
 
 d 0555 root sys /Applications/sudoku.app -
 d 0555 root sys /Applications/sudoku.app/Contents -
-f 0444 root sys /Applications/sudoku.app/Contents/Info.plist sudoku/sudoku.app/Contents/Info.plist
-f 0444 root sys /Applications/sudoku.app/Contents/PkgInfo sudoku/sudoku.app/Contents/PkgInfo
+f 0444 root sys /Applications/sudoku.app/Contents/Info.plist test/sudoku.app/Contents/Info.plist
+f 0444 root sys /Applications/sudoku.app/Contents/PkgInfo test/sudoku.app/Contents/PkgInfo
 d 0555 root sys /Applications/sudoku.app/Contents/MacOS -
 f 0555 root sys /Applications/sudoku.app/Contents/MacOS/sudoku test/sudoku
 d 0555 root sys /Applications/sudoku.app/Contents/Resources -
-f 0444 root sys /Applications/sudoku.app/Contents/Resources/sudoku.icns sudoku/sudoku.app/Contents/Resources/sudoku.icns
+f 0444 root sys /Applications/sudoku.app/Contents/Resources/sudoku.icns test/sudoku.app/Contents/Resources/sudoku.icns
 %postremove /bin/rm -rf /Applications/sudoku.app
 
 %system !darwin
 f 0555 root sys $bindir/checkers test/checkers
+f 0444 root sys /usr/share/applnk/Games/checkers.desktop test/checkers.desktop
+f 0444 root sys /usr/share/icons/hicolor/32x32/apps/checkers.png checkers/checkers-32.png
+f 0444 root sys /usr/share/icons/hicolor/128x128/apps/checkers.png checkers/checkers-128.png
+
 f 0555 root sys $bindir/sudoku test/sudoku
-f 0444 root sys /usr/share/applnk/Development/fluid.desktop fluid/fluid.desktop
-f 0444 root sys /usr/share/icons/hicolor/16x16/apps/fluid.png fluid/icons/fluid-16.png
-f 0444 root sys /usr/share/icons/hicolor/32x32/apps/fluid.png fluid/icons/fluid-32.png
-f 0444 root sys /usr/share/icons/hicolor/48x48/apps/fluid.png fluid/icons/fluid-48.png
-f 0444 root sys /usr/share/icons/hicolor/64x64/apps/fluid.png fluid/icons/fluid-64.png
-f 0444 root sys /usr/share/icons/hicolor/128x128/apps/fluid.png fluid/icons/fluid-128.png
-f 0444 root sys /usr/share/mimelnk/application/x-fluid.desktop fluid/x-fluid.desktop
+f 0444 root sys /usr/share/applnk/Games/sudoku.desktop test/sudoku.desktop
+f 0444 root sys /usr/share/icons/hicolor/32x32/apps/sudoku.png sudoku/sudoku-32.png
+f 0444 root sys /usr/share/icons/hicolor/128x128/apps/sudoku.png sudoku/sudoku-128.png
 
 %system all
 f 0444 root sys $mandir/cat6/checkers.$CAT6EXT documentation/checkers.$CAT6EXT