diff --git a/jline.spec b/jline.spec
index 76a4899..ab3c4bf 100644
--- a/jline.spec
+++ b/jline.spec
@@ -30,7 +30,7 @@
 
 Name:           jline
 Version:        0.9.94
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java library for reading and editing user input in console applications
 License:        BSD
 URL:            http://jline.sourceforge.net/
@@ -88,6 +88,9 @@ Javadoc for %{name}.
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
+# Remove pre-built Windows-only binary artifacts
+rm src/src/main/resources/jline/jline*.dll
+
 # Use locally installed DTDs
 mkdir build
 cp -p %{SOURCE1} build/
@@ -108,20 +111,16 @@ mvn-jpp -e -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
 rm -rf $RPM_BUILD_ROOT
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-for jar in $(find -type f -name "*.jar" | grep -E target/.*.jar); do
-        install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-done
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+install -pD -T src/target/%{name}-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-for target in $(find -type d -name target); do
-        install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
-        cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:jline-::g`
-done
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr src/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+# demo
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr examples %{buildroot}%{_datadir}/%{name}
 
 # pom
 install -pD -T -m 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
@@ -129,7 +128,6 @@ install -pD -T -m 644 src/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %clean
 rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/META-INF
 
 %post
 %update_maven_depmap
@@ -137,19 +135,33 @@ rm -rf $RPM_BUILD_DIR/META-INF
 %postun
 %update_maven_depmap
 
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files
 %defattr(-,root,root,-)
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 %doc LICENSE.txt
 
+%files demo
+%defattr(-,root,root,-)
+%{_datadir}/%{name}
+
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/*
 
 %changelog
+* Sat Dec 18 2010 Mat Booth <fedora@matbooth.co.uk> - 0.9.94-2
+- Remove pre-built Windows-only binary artifacts.
+- Demo package was defined but never built for some reason.
+- Don't also package jar in the javadoc package!
+- Drop versioned java and javadocs.
+
 * Sat Dec 18 2010 Mat Booth <fedora@matbooth.co.uk> - 0.9.94-1
 - Remove bundled jars in %%prep phase.
 - Tidy up spec file, fix some rpmlint warnings.