diff --git a/langs/limbo.yaml b/langs/limbo.yaml
index e1b15aa..34bae52 100644
--- a/langs/limbo.yaml
+++ b/langs/limbo.yaml
@@ -18,18 +18,28 @@ install:
     install -d "${pkg}/opt/inferno"
     install -d "${pkg}/usr/local/bin"
 
-    wget "$(curl -sSL http://www.vitanuova.com/inferno/downloads.html | grep -E 'inferno-[0-9]+\.tgz' | grep -Eo 'http://[^"]+')" -O inferno.tgz
-    tar -xf inferno.tgz -C "${pkg}/opt/inferno" --strip-components=1
-    chmod -R u+w,a=u,go-w "${pkg}/opt/inferno"
-    pushd "${pkg}/opt/inferno"
+    url="$(curl -sSL http://www.vitanuova.com/inferno/downloads.html | grep -E 'inferno-[0-9]+\.tgz' | grep -Eo 'http://[^"]+')"
+    wget "${url}" -O inferno.tgz
+
+    sudo mkdir /opt/inferno
+    sudo chown riju:riju /opt/inferno
+    tar -xf inferno.tgz -C /opt/inferno --strip-components=1
+    chmod -R u+w,a=u,go-w /opt/inferno
+
+    pushd /opt/inferno
     sed -i 's/gcc/gcc -m32/g' makemk.sh
     sed -i "s#ROOT=.*#ROOT=${PWD}#" mkconfig
     sed -i "s#CFLAGS=#CFLAGS=-fcommon#" mkfiles/mkfile-Linux-386
     ./makemk.sh
     PATH="$PWD/Linux/386/bin:$PATH" mk install
-    ln -s "/opt/inferno/Linux/386/bin/emu" "/opt/inferno/Linux/386/bin/limbo" "${pkg}/usr/local/bin/"
     popd
 
+    shopt -s dotglob
+    mv /opt/inferno/* "${pkg}/opt/inferno/"
+    sudo rmdir /opt/inferno
+
+    ln -s "/opt/inferno/Linux/386/bin/emu" "/opt/inferno/Linux/386/bin/limbo" "${pkg}/usr/local/bin/"
+
 setup: |
   ln -s /opt/inferno/* ./