diff --git a/.gitignore b/.gitignore
index ac77c42..cbf39dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 denemo-0.8.18.tar.gz
 /denemo-0.8.20.tar.gz
 /denemo-0.9.0.tar.gz
+/denemo-0.9.2.tar.gz
diff --git a/denemo.spec b/denemo.spec
index 41e7fd1..ff22249 100644
--- a/denemo.spec
+++ b/denemo.spec
@@ -1,7 +1,7 @@
 Summary:	Graphical music notation program
 Name:		denemo
-Version:	0.9.0
-Release:	0%{?dist}.2
+Version:	0.9.2
+Release:	0%{?dist}
 License:	GPLv3+
 Group:		Applications/Multimedia
 Source:		ftp://ftp.gnu.org/gnu/denemo/denemo-%{version}.tar.gz
@@ -19,33 +19,79 @@ BuildRequires: fontpackages-devel lash-devel libsamplerate-devel
 BuildRequires: gtksourceview2-devel fluidsynth-devel librsvg2-devel
 BuildRequires: chrpath
 
-Requires: bug-buddy lilypond alsa-plugins-pulseaudio
-Requires: denemo-music-fonts
+Requires: lilypond
+Requires: denemo-music-fonts = %{version}-%{release}
+Requires: denemo-emmentaler-fonts = %{version}-%{release}
+Requires: denemo-feta-fonts = %{version}-%{release}
+
+
+%description
+Denemo is a free software (GPL) music notation editor for GNU/Linux that 
+lets you rapidly enter notation for typesetting via the LilyPond music 
+engraver.  You can compose, transcribe, arrange, listen to the music 
+and much more. 
 
 %package music-fonts
-Summary:	Music notation fonts used in Denemo
-Group:		Applications/Multimedia
-License:	OFL
-BuildArch:	noarch
+Summary:	Denemo Denemo fonts
+Group:		User Interface/X
+License:	GPLV3+
+BuildArch:      noarch
 Requires:	fontpackages-filesystem
+Requires:	denemo-fonts-common = %{version}-%{release}
 
+%description music-fonts 
+Denemo is a free software (GPL) music notation editor for GNU/Linux that 
+lets you rapidly enter notation for typesetting via the LilyPond music 
+engraver.  You can compose, transcribe, arrange, listen to the music 
+and much more. 
 
+These are the Denemo.ttf fonts derived from FreeSerif.ttf and FreeSans.ttf. 
 
-%description
-Denemo is a graphical music notation program written in C with
-gtk+. As of April 2000, it is an official part of the GNU project
-(http://www.gnu.org/)
+%package emmentaler-fonts
+Summary:	Denemo emmentaler fonts
+Group:		User Interface/X
+License:	GPLV2
+BuildArch:      noarch
+Requires:	fontpackages-filesystem
+Requires:	denemo-fonts-common = %{version}-%{release}
+
+%description emmentaler-fonts 
+Denemo is a free software (GPL) music notation editor for GNU/Linux that 
+lets you rapidly enter notation for typesetting via the LilyPond music 
+engraver.  You can compose, transcribe, arrange, listen to the music 
+and much more. 
 
-It is intended to be used in conjunction with GNU Lilypond
-(http://www.cs.uu.nl/hanwen/lilypond/), but is adaptable to other
-computer-music-related purposes as well. 
+These are the emmentaler.ttf fonts derived from lilypond's font.
+
+%package feta-fonts
+Summary:	Denemo feta fonts
+Group:		User Interface/X
+License:	GPLV2
+BuildArch:      noarch
+Requires:	fontpackages-filesystem
+Requires:	denemo-fonts-common = %{version}-%{release}
 
-%description music-fonts
-This font set witten by Robert Allgeyer is the 2001 legacy version
-of MusiSync. It is a musical notations font set which was reordered 
-by Richard Shann for Denemo. 
+%description feta-fonts 
+Denemo is a free software (GPL) music notation editor for GNU/Linux that 
+lets you rapidly enter notation for typesetting via the LilyPond music 
+engraver.  You can compose, transcribe, arrange, listen to the music 
+and much more. 
 
-This font set is used by Denemo.
+These are the feta.ttf fonts derived from lilypond's font.
+
+%package fonts-common
+Summary:	Denemo fonts common dir
+Group:		User Interface/X
+BuildArch:      noarch
+Requires:	fontpackages-filesystem
+
+%description fonts-common
+Denemo is a free software (GPL) music notation editor for GNU/Linux that 
+lets you rapidly enter notation for typesetting via the LilyPond music 
+engraver.  You can compose, transcribe, arrange, listen to the music 
+and much more. 
+
+This contains the directory common to all Denemo fonts.
 
 %prep
 %setup -q
@@ -53,7 +99,8 @@ This font set is used by Denemo.
 #%patch -p0
 
 %build
-%configure --enable-jack --enable-lash
+%configure --enable-jack --enable-lash --with-included-smf
+
 make %{?_smp_mflags}
 chrpath -d src/denemo
 chmod 644 actions/*.scm
@@ -70,8 +117,6 @@ install -m 0755 -d %{buildroot}%{_fontdir}
 rm -f %{buildroot}/%{_bindir}/denemo-lilypond.bat
 
 
-# move the location of the music font
-mv fonts/LICENSE_OFL.txt LICENSE_OFL.txt
 install -m 0644 -p fonts/*.ttf %{buildroot}%{_fontdir}
 rm -rf %{buildroot}/%{_datadir}/fonts/truetype
 rm -rf %{buildroot}/%{_includedir}
@@ -91,16 +136,25 @@ rm -rf %{buildroot}
 %{_bindir}/denemo
 %doc COPYING README  ChangeLog 
 
+%_font_pkg -n feta feta.ttf
 
+%_font_pkg -n emmentaler emmentaler.ttf
 
+%_font_pkg -n music Denemo.ttf
 
-%_font_pkg -n music *.ttf
-%doc LICENSE_OFL.txt
-
+%files fonts-common
+%doc COPYING AUTHORS
+%defattr(0644,root,root,0755)
 
+%dir %{_fontdir}
 
 
 %changelog
+* Tue Oct 25 2011 Roy Rankin <rrankin@ihug.com.au> - 0.9.2-0
+ - Update for upstream release. For new features see
+   http://savannah.gnu.org/forum/forum.php?forum_id=6962
+ - Additional font sub-packages created.
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 0.9.0-0.2
 - rebuild with new gmp without compat lib
 
diff --git a/sources b/sources
index 80c574d..daa8ef1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7679622302e5fec9776501a5e2777888  denemo-0.9.0.tar.gz
+6dbe944f45cf8818b199e831ac7a5e4f  denemo-0.9.2.tar.gz