diff --git a/build.sh b/build.sh
index ea36b821c861fbb9351debd215c5780bc5bec632..97feb45229d97a61314310080790b915bc628ad8 100755
--- a/build.sh
+++ b/build.sh
@@ -6,16 +6,15 @@ if [ ! -d 'rd-builder' ] || [ ! -e "rd-builder/build.gradle" ]; then
   echo 'Pulling RD-Builder'
   git submodule init
 fi
+git submodule update
 
 EXTENDJ="rd-builder/extendj"
 
 echo "ExtendJ path: $EXTENDJ"
-if [ ! -e "$EXTENDJ/build.gradle" ]; then
+if [ ! -d '$EXTENDJ' ] || [ ! -e "$EXTENDJ/build.gradle" ]; then
   echo 'Pulling ExtendJ'
   (cd rd-builder; git submodule init)
 fi
-
-git submodule update
 (cd rd-builder; git submodule update)
 
 # Optional debug flags.
@@ -31,4 +30,8 @@ java \
   -jar rd-builder/rd-builder.jar \
   -d src/data \
   -ragroot $EXTENDJ \
-  $(find $EXTENDJ/src -name '*.java')
+  $(find $EXTENDJ/src -name '*.java') \
+  $(find $EXTENDJ/java8/src -name '*.java')
+
+# Build packed assets for publishing.
+ng build --prod --base-href "/doc/"
diff --git a/rd-builder b/rd-builder
index b8cfca720aaf1cf22e7423b362d5ec4666d311aa..9f59bdb6622c2166727262e977b5ae331a7f94f3 160000
--- a/rd-builder
+++ b/rd-builder
@@ -1 +1 @@
-Subproject commit b8cfca720aaf1cf22e7423b362d5ec4666d311aa
+Subproject commit 9f59bdb6622c2166727262e977b5ae331a7f94f3