diff --git a/Library/Homebrew/test/version_spec.rb b/Library/Homebrew/test/version_spec.rb
index 49dfad7878..99c301fb30 100644
--- a/Library/Homebrew/test/version_spec.rb
+++ b/Library/Homebrew/test/version_spec.rb
@@ -625,16 +625,23 @@ RSpec.describe Version do
         .to be_detected_from("https://www.monkey.org/~provos/libevent-1.4.14b-stable.tar.gz")
     end
 
-    specify "debian style 1" do
+    specify "debian style" do
       expect(described_class.new("3.03"))
         .to be_detected_from("https://ftp.de.debian.org/debian/pool/main/s/sl/sl_3.03.orig.tar.gz")
     end
 
-    specify "debian style 2" do
+    specify "debian style with letter suffix" do
       expect(described_class.new("1.01b"))
         .to be_detected_from("https://ftp.de.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz")
     end
 
+    specify "debian style dotless" do
+      expect(described_class.new("1"))
+        .to be_detected_from("https://deb.debian.org/debian/pool/main/e/example/example_1.orig.tar.gz")
+      expect(described_class.new("20040914"))
+        .to be_detected_from("https://deb.debian.org/debian/pool/main/e/example/example_20040914.orig.tar.gz")
+    end
+
     specify "bottle style" do
       expect(described_class.new("4.8.0"))
         .to be_detected_from("https://homebrew.bintray.com/bottles/qt-4.8.0.lion.bottle.tar.gz")
diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb
index 3ab67d324c..0c9005219e 100644
--- a/Library/Homebrew/version.rb
+++ b/Library/Homebrew/version.rb
@@ -462,8 +462,11 @@ class Version
     # e.g. `https://search.maven.org/remotecontent?filepath=org/apache/orc/orc-tools/1.2.3/orc-tools-1.2.3-uber.jar`
     StemParser.new(/-(#{NUMERIC_WITH_DOTS})-/),
 
-    # e.g. `dash_0.5.5.1.orig.tar.gz (Debian style)`
-    StemParser.new(/_(#{NUMERIC_WITH_DOTS}[abc]?)\.orig$/),
+    # Debian style
+    # e.g. `dash_0.5.5.1.orig.tar.gz`
+    # e.g. `lcrack_20040914.orig.tar.gz`
+    # e.g. `mkcue_1.orig.tar.gz`
+    StemParser.new(/_(#{NUMERIC_WITH_OPTIONAL_DOTS}[abc]?)\.orig$/),
 
     # e.g. `https://www.openssl.org/source/openssl-0.9.8s.tar.gz`
     StemParser.new(/-v?(\d[^-]+)/),