diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
new file mode 100644
index 000000000..f8ff68205
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
@@ -0,0 +1,20 @@
+local args = {...}
+if args[1] then
+  local file, reason = io.open("/etc/hostname", "w")
+  if not file then
+    io.stderr:write(reason .. "\n")
+  else
+    file:write(args[1])
+    file:close()
+    os.setenv("HOSTNAME", args[1])
+    os.setenv("PS1", "$HOSTNAME:$PWD# ")
+  end
+else
+  local file = io.open("/etc/hostname")
+  if file then
+    io.write(file:read("*l"), "\n")
+    file:close()
+  else
+    io.stderr:write("Hostname not set\n")
+  end
+end
diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
index e754143d7..1527af1ad 100644
--- a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
@@ -13,4 +13,13 @@ shell.setAlias("rs", "redstone")
 shell.setAlias("view", "edit -r")
 shell.setAlias("help", "man")
 shell.setAlias("?", "man")
-shell.setAlias("cp", "cp -i")
\ No newline at end of file
+shell.setAlias("cp", "cp -i")
+
+event.listen("init", function()
+  local file = io.open("/etc/hostname")
+  if file then
+    os.setenv("HOSTNAME", file:read("*l"))
+    os.setenv("PS1", "$HOSTNAME:$PWD# ")
+    file:close()
+  end
+end)
diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname b/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname
new file mode 100644
index 000000000..ae853e58a
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname
@@ -0,0 +1,12 @@
+NAME
+  hostname - Display and modify hostname
+
+SYNOPIS
+  hostname [NEW NAME]
+
+EXAMPLES
+  hostname
+    Prints currently set hostname
+
+  hostname test
+    Sets hostname of this computer to test
diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names
index 2587ce8c5..a14f0a57c 100644
--- a/src/main/resources/assets/opencomputers/robot.names
+++ b/src/main/resources/assets/opencomputers/robot.names
@@ -51,6 +51,7 @@ Kilobyte           # Contributor
 KITT               # Knight Rider
 Kodos              # Contributor
 Laire              # Perry Rhodan
+Loader 1340        # Borderlands 2
 LordFokas          # Contributor
 Marvin             # Hitchhiker's Guide to the Galaxy
 Michiyo            # Contributor