diff --git a/riscv-env/Dockerfile b/riscv-env/Dockerfile
index 2293abf..69a1f2e 100644
--- a/riscv-env/Dockerfile
+++ b/riscv-env/Dockerfile
@@ -1,4 +1,7 @@
-FROM ubuntu:latest
+# Environment for RustOS-RISCV
+
+# NOT ubuntu 18.04: libmpfr.so.4 error
+FROM ubuntu:17.10
 
 WORKDIR /rust
 
@@ -16,15 +19,20 @@ ADD rust-riscv-rust-1.26.0-1-dev.tar.gz .
 ADD rv32-toolchains-prebuild.tar.bz2 .
 
 # Dependencies
-RUN apt-get update && apt-get install -q -y --no-install-recommends libssl1.0.0 curl libssh2-1 gcc make git libc6-dev
+RUN apt-get update && apt-get install -q -y --no-install-recommends libssl1.0.0 libssh2-1 gcc make git libc6-dev \
+    autoconf automake autotools-dev curl libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev
 # Rust bins need this
 RUN mkdir -p /gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.26.105-g0890d5379c/lib \
 	&& ln -s /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 /gnu/store/n6acaivs0jwiwpidjr551dhdni5kgpcr-glibc-2.26.105-g0890d5379c/lib/ld-linux-x86-64.so.2
 # Install Rust toolchains
 RUN ./rust-1.26.0-dev-x86_64-unknown-linux-gnu/install.sh && rm -rf ./rust-1.26.0-dev-x86_64-unknown-linux-gnu
 # Install xargo
+RUN apt-get install -q -y ca-certificates
 RUN cargo install xargo
+# Dependencies for qemu-system-riscv32
+RUN apt-get install -q -y libglib2.0-0 libjpeg8 libpng16-16 libnuma1 libpixman-1-0 libaio1
 # Env
-ENV PATH=~/.cargo/bin:/rust/install-rv32/bin:$PATH
+ENV RISCV=/rust/install-rv32
+ENV PATH=~/.cargo/bin:$RISCV/bin:$PATH
 ENV XARGO_RUST_SRC=/rust/rust-riscv-rust-1.26.0-1-dev/src
 RUN ln -s ~/.cargo/bin/xargo /usr/local/bin/xargo
\ No newline at end of file