diff --git a/lib/rouge/lexers/docker.rb b/lib/rouge/lexers/docker.rb
index ba581a75fe..4ad9c75864 100644
--- a/lib/rouge/lexers/docker.rb
+++ b/lib/rouge/lexers/docker.rb
@@ -8,7 +8,7 @@ class Docker < RegexLexer
       desc "Dockerfile syntax"
       tag 'docker'
       aliases 'dockerfile', 'Dockerfile', 'containerfile', 'Containerfile'
-      filenames 'Dockerfile', '*.Dockerfile', '*.docker', 'Containerfile', '*.Containerfile'
+      filenames 'Dockerfile', 'Dockerfile.*', '*.Dockerfile', '*.docker', 'Containerfile', 'Containerfile.*', '*.Containerfile'
       mimetypes 'text/x-dockerfile-config'
 
       KEYWORDS = %w(
diff --git a/spec/lexers/docker_spec.rb b/spec/lexers/docker_spec.rb
index 2a086d9f4d..f845e524e8 100644
--- a/spec/lexers/docker_spec.rb
+++ b/spec/lexers/docker_spec.rb
@@ -11,8 +11,10 @@
       assert_guess :filename => 'Dockerfile'
       assert_guess :filename => 'docker.docker'
       assert_guess :filename => 'some.Dockerfile'
+      assert_guess :filename => 'Dockerfile.some'
       assert_guess :filename => 'Containerfile'
       assert_guess :filename => 'some.Containerfile'
+      assert_guess :filename => 'Containerfile.some'
     end
 
     it 'guesses by mimetype' do