diff --git a/Dockerfile b/Dockerfile
index bb55d87..548a59f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ## Emacs, make this -*- mode: sh; -*-
 
 ## start with the Docker 'base R' Debian-based image
-FROM r-base:latest
+FROM rocker/r2u:latest
 
 LABEL org.label-schema.license="GPL-2.0" \
       org.label-schema.vcs-url="https://github.com/rocker-org/drd" \
@@ -12,17 +12,15 @@ LABEL org.label-schema.license="GPL-2.0" \
 ## (as e.g. base-passwd in Oct 2020)
 ENV DEBIAN_FRONTEND noninteractive
 
-## Remain current
-RUN apt-get update -qq && apt-get dist-upgrade -y
-
 ## From the Build-Depends of the Debian R package, plus subversion
 ## Check out R-devel
 ## Build and install according the standard 'recipe' I emailed/posted years ago
 ## Set Renviron.site to get libs from base R install
 ## Clean up
 ## -- all in one command to get a single AUFS layer
-RUN apt-get update -qq && \
-        apt-get install -y -t unstable --no-install-recommends \
+RUN apt-get update -qq \
+    && apt-get dist-upgrade -y \
+    && apt-get install -y --no-install-recommends \
                 bash-completion \
                 bison \
                 debhelper \
@@ -33,22 +31,22 @@ RUN apt-get update -qq && \
                 groff-base \
                 libblas-dev \
                 libbz2-dev \
-                libcairo2-dev/unstable \
-                libcurl4-openssl-dev/unstable \
+                libcairo2-dev \
+                libcurl4-openssl-dev \
                 libfreetype-dev \
-                libharfbuzz-dev/unstable \
+                libharfbuzz-dev \
                 libjpeg-dev \
                 liblapack-dev \
                 liblzma-dev \
                 libncurses-dev \
-                libpango1.0-dev/unstable \
+                libpango1.0-dev \
                 libpcre2-dev \
                 libpng-dev \
                 libreadline-dev \
-                libtiff5-dev/unstable \
+                libtiff5-dev \
                 libx11-dev \
-                libxcb1-dev/unstable \
-                libxdmcp-dev/unstable \
+                libxcb1-dev \
+                libxdmcp-dev \
                 libxt-dev \
                 mpack \
                 subversion \
@@ -66,45 +64,49 @@ RUN apt-get update -qq && \
                 xfonts-base \
                 xvfb \
                 zlib1g-dev \
-        && cd /tmp \
-        && wget https://stat.ethz.ch/R/daily/R-devel.tar.xz \
-        && tar xaf R-devel.tar.xz \
-        && rm R-devel.tar.xz \
-        && cd /tmp/R-devel && \
-                R_PAPERSIZE=letter \
-                R_BATCHSAVE="--no-save --no-restore" \
-                R_BROWSER=xdg-open \
-                PAGER=/usr/bin/pager \
-                PERL=/usr/bin/perl \
-                R_UNZIPCMD=/usr/bin/unzip \
-                R_ZIPCMD=/usr/bin/zip \
-                R_PRINTCMD=/usr/bin/lpr \
-                LIBnn=lib \
-                AWK=/usr/bin/awk \
-                CFLAGS=$(R CMD config CFLAGS) \
-                CXXFLAGS=$(R CMD config CXXFLAGS) \
-                FFLAGS=$(R CMD config FFLAGS) \
-                ./configure --enable-R-shlib \
-                        --enable-memory-profiling \
-                        --with-blas \
-                        --with-lapack \
-                        --with-readline \
-                        --without-recommended-packages \
-                        --program-suffix=dev && \
-                cd /tmp/R-devel && \
-                make && \
-                make install && \
-                rm -rf /tmp/R-devel /tmp/downloaded_packages/ /tmp/*.rds \
-        && echo "R_LIBS=\${R_LIBS-'/usr/local/lib/R/site-library:/usr/local/lib/R/library:/usr/lib/R/site-library:/usr/lib/R/library'}" >> /usr/local/lib/R/etc/Renviron \
-        && echo 'options("repos"="https://cloud.r-project.org")' >> /usr/local/lib/R/etc/Rprofile.site \
-        && cd /usr/local/bin \
-        && mv R Rdevel \
-        && mv Rscript Rscriptdevel \
-        && ln -s Rdevel RD \
-        && ln -s Rscriptdevel RDscript \
-        && rm -f /usr/share/fonts/type1/texlive-fonts-recommended/.uuid \
-        && rm -f /usr/share/fonts/type1/.uuid \
-        && apt-get purge -qy \
+    && cd /tmp \
+    && wget https://stat.ethz.ch/R/daily/R-devel.tar.xz \
+    && tar xaf R-devel.tar.xz \
+    && rm R-devel.tar.xz \
+    && cd /tmp/R-devel \
+    && R_PAPERSIZE=letter \
+       R_BATCHSAVE="--no-save --no-restore" \
+       R_BROWSER=xdg-open \
+       PAGER=/usr/bin/pager \
+       PERL=/usr/bin/perl \
+       R_UNZIPCMD=/usr/bin/unzip \
+       R_ZIPCMD=/usr/bin/zip \
+       R_PRINTCMD=/usr/bin/lpr \
+       LIBnn=lib \
+       AWK=/usr/bin/awk \
+       CFLAGS=$(R CMD config CFLAGS) \
+       CXXFLAGS=$(R CMD config CXXFLAGS) \
+       FFLAGS=$(R CMD config FFLAGS) \
+       ./configure --enable-R-shlib \
+               --enable-memory-profiling \
+               --with-blas \
+               --with-lapack \
+               --with-readline \
+               --without-recommended-packages \
+    && cd /tmp/R-devel \
+    && make \
+    && make install \
+    && cd /tmp \
+    && rm -rf /tmp/R-devel /tmp/downloaded_packages/ /tmp/*.rds \
+    && echo "R_LIBS=\${R_LIBS-'/usr/local/lib/R/site-library:/usr/local/lib/R/library:/usr/lib/R/site-library:/usr/lib/R/library'}" >> /usr/local/lib/R/etc/Renviron \
+    && /usr/local/bin/R -e 'install.packages("littler", lib="/usr/local/lib/R/site-library", repos="https://cloud.r-project.org")' \
+    && cd /usr/local/bin \
+    && cp -vax /usr/local/lib/R/site-library/littler/bin/r . \
+    && for f in build.r check.r install2.r installBioc.r installDeps.r installGithub.r install.r installRub.r testInstalled.r update.r; do ln -sf /usr/local/lib/R/site-library/littler/examples/$f .; done \
+    && cd /usr/local/lib/R/etc/ && ln -sf /etc/R/Rprofile.site . \
+    && cd /usr/local/bin \
+    && mv R Rdevel \
+    && mv Rscript Rscriptdevel \
+    && ln -s Rdevel RD \
+    && ln -s Rscriptdevel RDscript \
+    && rm -f /usr/share/fonts/type1/texlive-fonts-recommended/.uuid \
+    && rm -f /usr/share/fonts/type1/.uuid \
+    && apt-get purge -qy \
                 libblas-dev \
                 libbz2-dev  \
                 libcairo2-dev \
@@ -136,8 +138,8 @@ RUN apt-get update -qq && \
                 texlive-plain-generic \
                 tk-dev \
                 tk8.6-dev \
-        && apt-get autoremove -qy \
-        && rm -rf /tmp/R-devel
+    && apt-get autoremove -qy \
+    && rm -rf /tmp/R-devel
 
 ## Copy 'checkbashisms' (as a local copy from devscripts package)
 COPY checkbashisms /usr/local/bin