diff --git a/Formula/gomuks-dev.rb b/Formula/gomuks-dev.rb
new file mode 100644
index 0000000..6e078a2
--- /dev/null
+++ b/Formula/gomuks-dev.rb
@@ -0,0 +1,25 @@
+class GomuksDev < Formula
+  desc "Terminal based Matrix client written in Go"
+  homepage "https://maunium.net/go/gomuks"
+  url "https://github.com/tulir/gomuks/archive/e6a2c3ff85358c271e8b28888fc4b9c9f0585d07.tar.gz"
+  version "0.3.1-e6a2c3f"
+  sha256 "e215cf5d907f9af4cfd308de8b898d0eaf24cd4c65b93464411412f71b9b7b92"
+
+  livecheck do
+    skip "Unstable"
+  end
+
+  depends_on "go" => :build
+  depends_on "libolm"
+
+  def install
+    system "go", "build", *std_go_args, "-ldflags", "-s -w -X main.Tag=#{version} -X 'main.BuildTime=#{Time.now}'"
+    doc.install "README.md"
+  end
+
+  test do
+    assert_match "gomuks #{version.major_minor_patch}", shell_output("#{bin}/gomuks-dev --version").strip
+  end
+
+  # gomuks stores things in ~/Library/Caches/gomuks and ~/Library/Application Support/gomuks
+end
diff --git a/gomuks.rb b/Formula/gomuks.rb
similarity index 68%
rename from gomuks.rb
rename to Formula/gomuks.rb
index 8ca154c..a3f0c49 100644
--- a/gomuks.rb
+++ b/Formula/gomuks.rb
@@ -1,8 +1,13 @@
 class Gomuks < Formula
   desc "Terminal based Matrix client written in Go"
   homepage "https://maunium.net/go/gomuks"
-  url "https://github.com/tulir/gomuks/archive/v0.3.0.tar.gz"
-  sha256 "0710a63cc3ec9a4f525510497ba64aa94170498eb536411d089871f336d99ab4"
+  url "https://github.com/tulir/gomuks/archive/refs/tags/v0.3.1.tar.gz"
+  sha256 "e5212c416a84a5e8f46ab6b36cf9cfec36918930dbf7a155cce00570887600f7"
+  head "https://github.com/tulir/gomuks.git", branch: "master"
+
+  livecheck do
+    url :stable
+  end
 
   depends_on "go" => :build
   depends_on "libolm"
diff --git a/gomuks-dev.rb b/gomuks-dev.rb
deleted file mode 100644
index 039cc57..0000000
--- a/gomuks-dev.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class GomuksDev < Formula
-  desc "Terminal based Matrix client written in Go"
-  homepage "https://maunium.net/go/gomuks"
-  url "https://github.com/tulir/gomuks/archive/e569c1519a1041c13b3b7fc76daef58bc4454e4d.tar.gz"
-  sha256 "8daf3f9afdcf5a924a2e3693c3ac9ae880f288194399eb73a6f8c3585c241576"
-  version "0.2.4-e569c15"
-
-  depends_on "go" => :build
-  depends_on "libolm"
-
-  def install
-    system "go", "build", *std_go_args, "-ldflags", "-s -w"
-    doc.install "README.md"
-  end
-
-  test do
-    assert_equal "gomuks version v#{version.to_s[0, 5]}", shell_output("#{bin}/gomuks-dev --version").strip
-  end
-
-  # gomuks stores things in ~/Library/Caches/gomuks and ~/Library/Application Support/gomuks
-end