diff --git a/src/riscv-ubuntu/README.md b/src/riscv-ubuntu/README.md
new file mode 100644
index 0000000..8c3b018
--- /dev/null
+++ b/src/riscv-ubuntu/README.md
@@ -0,0 +1,205 @@
+---
+title: Linux x86-ubuntu image
+tags:
+    - riscv
+    - fullsystem
+layout: default
+permalink: resources/riscv-ubuntu
+shortdoc: >
+    Resources to build a generic riscv-ubuntu disk image.
+author: ["Hoa Nguyen"]
+---
+
+This document provides instructions to create the "riscv-ubuntu" image and
+points to the gem5 component that would work with the disk image. The
+riscv-ubuntu disk image is based on Ubuntu's preinstalled server image for
+RISC-V SiFive HiFive Unmatched available at
+(https://cdimage.ubuntu.com/releases/20.04.3/release/).
+The `.bashrc` file would be modified in such a way that it executes
+a script passed from the gem5 configuration files (using the `m5 readfile`
+instruction).
+
+We assume the following directory structure while following the instructions in this README file:
+
+```
+riscv-ubuntu/
+  |___ gem5/                                   # gem5 source code (to be cloned here)
+  |
+  |___ riscv-gnu-toolchain/
+  |
+  |___ qemu/
+  |
+  |___ disk-image/
+  |      |___ shared/                          # Auxiliary files needed for disk creation
+  |      |___ riscv-ubuntu/
+  |              |___ exit.sh                  # Exits the simulated guest upon booting
+  |
+  |___ ubuntu.img                              # The disk image
+  |
+  |___ README.md                               # This README file
+```
+
+# Installing the RISCV toolchain and QEMU
+
+```sh
+# Install QEMU dependencies
+sudo apt-get install ninja-build
+
+cd riscv-ubuntu/
+
+# QEMU
+git clone https://github.com/qemu/qemu
+cd qemu
+git checkout 0021c4765a6b83e5b09409b75d50c6caaa6971b9
+./configure --target-list=riscv64-softmmu
+make -j $(nproc)
+make install
+
+cd ..
+
+# RISCV toolchain
+git clone https://github.com/riscv-collab/riscv-gnu-toolchain --recursive
+cd riscv-gnu-toolchain
+git checkout 1a36b5dc44d71ab6a583db5f4f0062c2a4ad963b
+# --prefix parameter specifying the installation location
+./configure --prefix=/opt/riscv
+make linux -j $(nproc)
+
+cd ..
+```
+
+# Downloading the Preinstalled Disk Image
+
+There are more versions of Ubuntu that are supported for RISCV, they
+are available at (https://wiki.ubuntu.com/RISC-V).
+In the following command, we will use the Ubuntu 20.04.3 disk image.
+
+```sh
+# downloading the disk image
+wget https://cdimage.ubuntu.com/releases/20.04.3/release/ubuntu-20.04.3-preinstalled-server-riscv64+unmatched.img.xz
+# unpacking/decompressing the disk image
+xz -dk ubuntu-20.04.3-preinstalled-server-riscv64+unmatched.img.xz
+# renaming the disk image
+mv ubuntu-20.04.3-preinstalled-server-riscv64+unmatched.img ubuntu.img
+# adding 10GB to the disk
+qemu-img resize -f raw ubuntu.img +10G
+```
+
+# Installing Ubuntu Packages Containing Necessary Files for Booting the Disk Image with QEMU
+
+According to (https://wiki.ubuntu.com/RISC-V),
+
+>  Prerequisites:
+>
+>    apt install qemu-system-misc opensbi u-boot-qemu qemu-utils
+>
+> Hirsute's version of u-boot-qemu is required at the moment to boot hirsute images.
+
+To use Hirsute's version of u-boot-qemu, we will download the package from here,
+(https://packages.ubuntu.com/hirsute/u-boot-qemu). The following command will
+download and install the package.
+
+```sh
+wget http://mirrors.kernel.org/ubuntu/pool/main/u/u-boot/u-boot-qemu_2021.01+dfsg-3ubuntu9_all.deb
+dpkg -i u-boot-qemu_2021.01+dfsg-3ubuntu9_all.deb
+apt-get install -f
+```
+
+The following command will install the rest of the dependencies,
+```sh
+apt install qemu-system-misc opensbi qemu-utils
+```
+
+# Download gem5 and Compiling m5
+
+```sh
+# Within the `src/riscv-ubuntu` directory.
+git clone https://gem5.googlesource.com/public/gem5
+cd gem5/util/m5
+scons build/riscv/out/m5
+cd ../../..
+```
+
+**Note**: the default cross-compiler is `riscv64-unknown-linux-gnu-`.
+To change the cross-compiler, you can set the cross-compiler using the scons
+sticky variable `riscv.CROSS_COMPILE`. For example,
+```sh
+scons riscv.CROSS_COMPILE=riscv64-linux-gnu- build/riscv/out/m5
+```
+
+# Booting the Disk Image with QEMU
+
+The following qemu command will boot the system using the disk image and the
+bootloader downloaded earlier.
+```sh
+./qemu/build/qemu-system-riscv64 -machine virt -nographic \
+     -m 16384 -smp 8 \
+     -bios /usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.elf \
+     -kernel /usr/lib/u-boot/qemu-riscv64_smode/uboot.elf \
+     -device virtio-net-device,netdev=eth0 \
+     -netdev user,id=eth0,hostfwd=tcp::5555-:22 \
+     -drive file=ubuntu.img,format=raw,if=virtio
+```
+**Note:** the above command will forward the guest's port 22 to the host's
+port 5555. This is done so that we can transfer and install benchmarks
+to the guest system from the host via SSH (and using `scp`).
+
+On the first boot, the guest OS will ask to input username and password.
+The default username and password is,
+```
+Username: ubuntu
+Password: ubuntu
+```
+
+After changing the password and login to the guest OS, you can stop cloud-init
+and launch the SSH server,
+
+```sh
+sudo touch /etc/cloud/cloud-init.disabled # stop cloud-init
+/etc/init.d/ssh start # start the SSH server
+sudo apt-get update
+sudo apt-get upgrade
+```
+
+
+
+**Notes:** it is strongly recommended to use key-based authentication to
+SSH to the guest.
+
+# Install the Benchmark
+
+From host, copy the auto log-in script and the benchmark using `scp`,
+```sh
+cd riscv-ubuntu/
+scp -P 5555 gem5/util/m5/build/riscv/out/m5 ubuntu@localhost:/home/ubuntu/
+scp -P 5555 disk-image/shared/serial-getty@.service ubuntu@localhost:/home/ubuntu/
+scp -P 5555 disk-image/riscv-ubuntu/gem5_init.sh ubuntu@localhost:/home/ubuntu/
+```
+
+Connecting to the guest,
+```sh
+ssh -p 5555 ubuntu@localhost
+```
+
+In the guest,
+```sh
+sudo -i
+# input password
+
+mv /home/ubuntu/serial-getty@.service /lib/systemd/system/
+
+mv /home/ubuntu/m5 /sbin
+ln -s /sbin/m5 /sbin/gem5
+
+mv /home/ubuntu/gem5_init.sh /root/
+chmod +x /root/gem5_init.sh
+echo "/root/gem5_init.sh" >> /root/.bashrc
+```
+
+# Pre-built disk image
+
+A pre-build, gzipped, disk image is available at <http://dist.gem5.org/dist/develop/images/riscv/ubuntu-20-04/riscv-ubuntu.img.gz>. **Note**: The password set for the `ubuntu` user is `helloworld`.
+
+# Using the Disk Image
+This disk image is used in the gem5 example RISCV config, found within the gem5 repository:
+`gem5/configs/example/components-library/riscv_fs.py`.
\ No newline at end of file
diff --git a/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh b/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh
new file mode 100755
index 0000000..bbdbbfb
--- /dev/null
+++ b/src/riscv-ubuntu/disk-image/riscv-ubuntu/gem5_init.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Copyright (c) 2021 The University of Texas at Austin.
+# SPDX-License-Identifier: BSD 3-Clause
+
+echo "Starting gem5 init... reading run script file."
+if ! m5 readfile > /tmp/script; then
+    echo "Failed to run m5 readfile, exiting!"
+    rm -f /tmp/script
+    if ! m5 exit; then
+        # Useful for booting the disk image in (e.g.,) qemu for debugging
+        echo "m5 exit failed, dropping to shell."
+        /bin/sh
+    fi
+else
+    echo "Running m5 script from /tmp/script"
+    chmod 755 /tmp/script
+    /tmp/script
+    echo "Done running script, exiting."
+    rm -f /tmp/script
+    m5 exit
+fi
diff --git a/src/riscv-ubuntu/disk-image/shared/serial-getty@.service b/src/riscv-ubuntu/disk-image/shared/serial-getty@.service
new file mode 100644
index 0000000..b0424f0
--- /dev/null
+++ b/src/riscv-ubuntu/disk-image/shared/serial-getty@.service
@@ -0,0 +1,46 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Serial Getty on %I
+Documentation=man:agetty(8) man:systemd-getty-generator(8)
+Documentation=http://0pointer.de/blog/projects/serial-console.html
+BindsTo=dev-%i.device
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service getty-pre.target
+After=rc-local.service
+
+# If additional gettys are spawned during boot then we should make
+# sure that this is synchronized before getty.target, even though
+# getty.target didn't actually pull it in.
+Before=getty.target
+IgnoreOnIsolate=yes
+
+# IgnoreOnIsolate causes issues with sulogin, if someone isolates
+# rescue.target or starts rescue.service from multi-user.target or
+# graphical.target.
+Conflicts=rescue.service
+Before=rescue.service
+
+[Service]
+# The '-o' option value tells agetty to replace 'login' arguments with an
+# option to preserve environment (-p), followed by '--' for safety, and then
+# the entered username.
+ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM
+Type=idle
+Restart=always
+UtmpIdentifier=%I
+TTYPath=/dev/%I
+TTYReset=yes
+TTYVHangup=yes
+KillMode=process
+IgnoreSIGPIPE=no
+SendSIGHUP=yes
+
+[Install]
+WantedBy=getty.target