diff --git a/.gitmodules b/.gitmodules
index d265cd1a..6ac3bb08 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "src/main/resources/mcdrama"]
 	path = src/main/resources/mcdrama
 	url = https://github.com/Gaelan/MCDrama.git
+[submodule "src/main/resources/modname"]
+	path = src/main/resources/modname
+	url = https://github.com/4hrue2kd83f/MCDrama.git
diff --git a/src/main/java/com/tterrag/k9/commands/CommandModname.java b/src/main/java/com/tterrag/k9/commands/CommandModname.java
new file mode 100644
index 00000000..b5c2fdd4
--- /dev/null
+++ b/src/main/java/com/tterrag/k9/commands/CommandModname.java
@@ -0,0 +1,92 @@
+package com.tterrag.k9.commands;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigInteger;
+
+import org.apache.commons.io.IOUtils;
+import org.jruby.RubyIO;
+import org.jruby.embed.ScriptingContainer;
+
+import com.google.common.base.Charsets;
+import com.tterrag.k9.K9;
+import com.tterrag.k9.commands.api.Command;
+import com.tterrag.k9.commands.api.CommandBase;
+import com.tterrag.k9.commands.api.CommandContext;
+import com.tterrag.k9.util.EmbedCreator;
+import com.tterrag.k9.util.annotation.Nullable;
+
+import reactor.core.publisher.Mono;
+
+@Command
+public class CommandModname extends CommandBase {
+    
+    private final ScriptingContainer sc = new ScriptingContainer();
+    private final @Nullable Object modname;
+
+    public CommandModname() {
+        super("modname", false);
+        InputStream script = K9.class.getResourceAsStream("/modname/modname.rb");
+        if (script != null) {
+            modname = sc.runScriptlet(new InputStreamReader(script), "modname.rb");
+        } else {
+            modname = null;
+        }
+        InputStream dramaversion = K9.class.getResourceAsStream("/modname/.dramaversion");
+        String version = null;
+        if (dramaversion != null) {
+            try {
+                version = IOUtils.readLines(dramaversion, Charsets.UTF_8).get(0);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        if (version == null) {
+            Process proc;
+            try {
+                proc = Runtime.getRuntime().exec("git submodule --quiet foreach git rev-parse --short HEAD");
+                proc.waitFor();
+                version = IOUtils.readLines(proc.getInputStream(), Charsets.UTF_8).get(0);
+            } catch (IOException | InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (version != null) {
+            sc.callMethod(modname, "set_current_version", version);
+        }
+    }
+    
+    @Override
+    public Mono<?> process(CommandContext ctx) {
+        if (modname != null) {
+            sc.callMethod(modname, "set_file_fetcher", new Object() {
+                @SuppressWarnings("unused")
+                public RubyIO open(String path) {
+                    return new RubyIO(sc.getProvider().getRuntime(), K9.class.getResourceAsStream("/modname/" + path));
+                }
+            });
+            BigInteger seed = (BigInteger) sc.callMethod(sc.get("Random"), "new_seed");
+			sc.callMethod(sc.get("Random"), "srand", seed);
+            String drama = ((String) sc.callMethod(modname, "draminate")).replaceAll("(\\r\\n|\\r|\\n)", "");
+            
+            return ctx.getMember()
+                .map(m -> m.getDisplayName())
+                .switchIfEmpty(Mono.justOrEmpty(ctx.getAuthor().map(a -> a.getUsername())))
+                .map(name -> 
+                    EmbedCreator.builder()
+                        .title("Mod Name Generator")
+                        .url("https://mod-name-generator.herokuapp.com/" + "d67ee8" + "/" + seed.toString(36))
+                        .description(drama)
+                        .build())
+                .flatMap(ctx::reply);
+        } else {
+            return ctx.error("Sorry, the modname command is not set up properly. Contact your bot admin!");
+        }
+    }
+    
+    @Override
+    public String getDescription(CommandContext ctx) {
+        return "Generates a random mod name.";
+    }
+}
diff --git a/src/main/resources/modname b/src/main/resources/modname
new file mode 160000
index 00000000..fc89d065
--- /dev/null
+++ b/src/main/resources/modname
@@ -0,0 +1 @@
+Subproject commit fc89d065b6e66bb5a0b53b7779d9391c92f4908f