diff --git a/java-1_8_0-openj9.spec b/java-1_8_0-openj9.spec
index 9dfcf75..94d2364 100644
--- a/java-1_8_0-openj9.spec
+++ b/java-1_8_0-openj9.spec
@@ -399,6 +399,7 @@ bash configure \
     CC=gcc-7 \
     NM=gcc-nm-7 \
 %endif
+    --enable-demos \
     --disable-zip-debug-info \
     --with-milestone="fcs" \
     --with-update-version=%{updatever} \
@@ -534,7 +535,7 @@ pushd %{imagesdir}/j2sdk-image
   done
 
   # Install demos and samples.
-  cp -a ../../jdk/demo %{buildroot}%{_jvmdir}/%{sdkdir}
+  cp -a demo %{buildroot}%{_jvmdir}/%{sdkdir}
   # enable short-circuit
   mkdir -p sample/rmi
   [ -f bin/java-rmi.cgi ] && mv bin/java-rmi.cgi sample/rmi